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
English corrections

might not be perfect still, but i like it better this way :P

good luck !!
test increase timeout
test increase timeout
remove unless bundle
corrected compression with yui compressor
Merge pull request #15 from flip111/patch-1

English corrections
fixed user autocomplete
Complete team gestion
fix CS
Merge pull request #16 from Shine-neko/fix/team

Fix team