Never gonna give you up
Merge branch 'master' of https://github.com/Majes/CoreBundle

Conflicts:
	Resources/public/stylesheets/majescore.css