Simplify LocaleController and remove unused locale routes
Simplify the MediaController
Merge branch 'master' into controller_fixes
Merge pull request #1026 from akeneo/controller_fixes

Avoid extending the AbstractDoctrineController when not necessary