by ju
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/main.js
	public/themes/glowsimple/default.css
	views/index.html