Upgrading to MajeS'Teel 1.2

Signed-off-by: BabarMajes <al@neomajes.com>
Merge branch 'master' of https://github.com/Majes/CoreBundle

Signed-off-by: BabarMajes <al@neomajes.com>

Conflicts:
	Resources/config/routing.yml