Minor bug fixes and such
Merge branch 'master' of https://github.com/ECSA/website

Conflicts:
	app/partials/home.html