UI Updates
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app.js
Jamie wants this