Merge remote-tracking branch 'origin/master' into node-mailer

Conflicts:
	routes/main.js
left-over from merge
Merge remote-tracking branch 'origin/node-mailer' into node-mailer

Conflicts:
	routes/main.js
	www/js/classes/App.js