Merge remote-tracking branch 'origin/master' into content

Conflicts:
	Resources/config/services.yml
Merge branch 'content' of git://github.com/c2is/BigfootNavigationBundle into content
Refacto navigation
Merge branch 'content'
fix