cleanup
remove unless assets
 Please enter the commit message for your changes. Lines starting
Merge branch 'master' into refactor-chat
Polish chatRoom
Merge branch 'master' into refactor-chat
Merge branch 'master' into refactor-chat
Merge branch 'master' of https://github.com/tempo-project/tempo into refactor-chat
Merge branch 'master' into refactor-chat
Merge branch 'master' into refactor-chat
Merge branch 'master' into refactor-chat

Conflicts:
	app/config/config_dev.yml
test increase timeout
test increase timeout
remove unless bundle
corrected compression with yui compressor
Merge branch 'master' into refactor-chat

Conflicts:
	bower.json
	src/Tempo/Bundle/MainBundle/Resources/views/Layout/web.html.twig
Merge branch 'master' into refactor-chat

Conflicts:
	.travis.yml
	bower.json
	composer.json
Merge branch 'master' into refactor-chat

Conflicts:
	composer.json
	src/Tempo/Bundle/MainBundle/Controller/Frontend/MessagesController.php
	src/Tempo/Bundle/MainBundle/Resources/config/services.xml
	src/Tempo/Bundle/MainBundle/Resources/views/Default/dashboard.html.twig
Fix typo