Added significant changes/improvements to UI.
Merge branch 'nick_frontend' into frontend_merge

Conflicts:
	client/index.html
	client/js/main.js