merge
move template.html.twig
Merge branch 'master' of github.com:Ant-keke/YoungSkilledCMS

Conflicts:
	src/YoungSkilled/CMSDeveloperBundle/Resources/views/compoundComponent/compoundComponent.html.twig