Change scaffolding's controller template
Merge pull request #333 from odoo-dev/master-improve-scaffold-deploy-fme

Change scaffolding's controller template
Merge branch 'master' of https://github.com/odoo/odoo into master-linux64