Continued work on sign in
Merge remote-tracking branch 'origin/dev' into justin

Conflicts:
	CAPPamari.Web/bin/CAPPamari.Web.dll
	CAPPamari.Web/bin/CAPPamari.Web.pdb
	CAPPamari.v11.suo
fixed layout because I can't type
Merge branch 'justin' into nicholas