integration
Merge branch 'master' of github.com:Empeeric/boilerplate

Conflicts:
	front/views/index.dust
	front/views/layout.dust
	front/views/partials/menu.dust
	server/app.js
	server/cms.js
	server/models/content.js
	server/models/navigation.js
	server/routes.js