Merge branch 'develop' into Features/chat
* Added most of webservices for chats
* Added first version of chat app
* Corrected some bugs, added way to get current user
* Subtle changes
* 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
* Adapted to new app structure
* Filtered discussions for a user
* Working on the chat interface & functionality
* Worked on chat interface, added action buttons & cross
* Modified message list so that several sends can be grouped
* Bubble look for discussions
* Small fix to style
* Added way to create and delete discussions. To be improved though.
Merge branch 'develop' into Features/file_sharing
Merge branch 'Features/chat' into develop
Merge branch 'develop' into Features/file_sharing