Merge branch 'develop' into staging

* develop:
  update composer.json to pull master of extensions

composer.json

@@ -23,7 +23,6 @@
 		{
 			"type": "git",
 			"url": "https://git2.meramo.org/typo3-Extensions/chatbotbegriffe.git",
-			"branch": "staging",
 			"options": {
 				"ssl": {
 					"verify_peer": true,