Merge neonunux/master

Conflicts:
	src/Tangara/ProjectBundle/Resources/config/routing.yml
Merge neonunux/master