Merge pull request #5157 from owncloud/fixing-appframework-master

lib/base.php

lib/private/appframework/core/api.php

lib/private/appframework/dependencyinjection/dicontainer.php

lib/private/appframework/http/dispatcher.php

lib/private/appframework/middleware/middlewaredispatcher.php

...e/appframework/middleware/security/securitymiddleware.php

lib/private/apphelper.php

lib/private/helper.php

lib/private/l10n/factory.php

lib/private/server.php

lib/private/urlgenerator.php

lib/public/appframework/controller.php

lib/public/appframework/http/templateresponse.php

lib/public/appframework/iapi.php

lib/public/appframework/iappcontainer.php

lib/public/appframework/middleware.php

tests/lib/appframework/AppTest.php

tests/lib/appframework/controller/ControllerTest.php

.../lib/appframework/dependencyinjection/DIContainerTest.php

tests/lib/appframework/http/DispatcherTest.php