Merge remote-tracking branch 'origin/master'

Conflicts:
	BHSCMSApp/BHSCMSApp/BHSCMSApp.csproj