merge
Changes in the form
Merge branch 'master' of github.com:Ant-keke/YoungSkilledCMS

Conflicts:
	src/YoungSkilled/CMSDeveloperBundle/Resources/public/js/selector.js