coding style
* Changed structure of app to allow multiapp
Merge branch 'develop' of github.com:SaltySoft/SmartBlocks into develop
Merge branch 'develop' into Features/chat

Conflicts:
	App/Controllers/UsersController.php
	App/Models/User.php
	App/Views/Layouts/default.html.twig
	Public/Apps/Chat/app.js
	Public/Apps/Chat/router.js