Handlebars
Handlebars
Merge branch 'master' of ssh://github.com/mookey/consi

Conflicts:
	app.js
	public/js/templates.js
	server/config/app_config.js
	server/controllers/routes.js
	server/utils/utils.js