Merge branch 'develop' into staging

* develop:
  update gitignore

.gitignore

@@ -11,3 +11,4 @@ nbproject
 !/public/typo3conf/LocalConfiguration.php
 !/public/typo3conf/AdditionalConfiguration.php
 /extensions/*
+!/extensions/keep