Починил-таки хуки
Merge branch 'master' of https://github.com/alex4321/NodeCMF

Conflicts:
	app/globals.js
	app/modules/example/module.js