commit hpub generator
Merge branch 'master' of https://github.com/dni/publish-

Conflicts:
	components/backend/modules/magazine/generators/HpubGenerator.js
	components/backend/modules/magazine/server.js
	components/backend/modules/magazine/view/MagazineDetailView.coffee
	components/backend/modules/magazine/view/MagazineLayout.coffee