Many bug fixes that came out of beta testing.

Minor fixes with ui and adding the little things to make it work better
Merge remote-tracking branch 'origin/justin' into nicholas

Conflicts:
	CAPPamari.Web/Scripts/Main.js
	CAPPamari.Web/Views/Shared/_Layout.cshtml