updates to righthand display
Merge branch 'master' of https://github.com/bradmann/ml7

Conflicts:
	src/app/views/main/main.html.xqy
	src/public/css/main.css
	src/public/js/main.js
forgot to add logo