Merge remote-tracking branch 'origin/justin' into Laura

Conflicts:
	CAPPamari.Web/bin/CAPPamari.Web.dll
	CAPPamari.Web/bin/CAPPamari.Web.pdb
	CAPPamari.v11.suo
Merge branch 'justin' into Laura
Merge branch 'Laura' into nicholas