config updated
detached head?
Merge branch 'master' of https://github.com/Kreyo/messaging-based-on-symfony

Conflicts:
	app/config/config.yml