Merge remote-tracking branch 'origin/master' into feature/angular
This is mainly for psr compliant files
Conflicts:
	app/Criterion/UI/View/Layout.twig