fix merge routing
Merge branch 'master' of https://github.com/Seijikaldeara/2SN

Conflicts:
	src/Etna/SocialBundle/Resources/config/routing.yml