Fixing and upgrading
Merge branch 'master' of https://github.com/Majes/CoreBundle