bakerGen / file serverjs / config
Merge branch 'master' of https://github.com/dni/publish-

Conflicts:
	components/backend/modules/files/server.js
	components/backend/modules/magazine/generators/BakerGenerator.js