Merge branch 'ui' into dev

Conflicts:
	app/controllers/contests.js
	views/root/index.ect