Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
	public/global/css/style.css
	routes/feedback.js
	views/layout.jade