Assorted Bug Fixes
Merge branch 'master' of https://github.com/HansonDodge/DirtyGirl

Conflicts:
	src/DirtyGirl.Web/Scripts/DirtyGirl.js
	src/DirtyGirl.Web/Views/User/ViewUser.cshtml