increase timeout.
cleanup
English corrections

might not be perfect still, but i like it better this way :P

good luck !!
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
cleanup
Merge remote-tracking branch 'origin' into fix/patch
minor fixed
Merge branch 'master' into refactor-chat

Conflicts:
	bower.json
	src/Tempo/Bundle/MainBundle/Resources/views/Layout/web.html.twig