.
Merge branch 'master' of https://github.com/Szymciosek/chat_symfony2