Fix UI
Merge branch 'master' of github.com:kmackinnon/TentacularApps

Conflicts:
	views/master.jade