no message
no message
Merge remote-tracking branch 'origin/master'

Conflicts:
	LotBankingCrux_v_1/LotBankingCrux_v_1/AcceptProposals.aspx.designer.cs
	LotBankingCrux_v_1/LotBankingCrux_v_1/Builder.aspx.designer.cs
	LotBankingCrux_v_1/LotBankingCrux_v_1/CBHDashboard.aspx.designer.cs
	LotBankingCrux_v_1/LotBankingCrux_v_1/LotBankingCrux_v_1.csproj
	LotBankingCrux_v_1/LotBankingCrux_v_1/Register.aspx.designer.cs
	LotBankingCrux_v_1/LotBankingCrux_v_1/RegisterExternalLogin.aspx.designer.cs
	LotBankingCrux_v_1/LotBankingCrux_v_1/Registration.aspx.designer.cs
	LotBankingCrux_v_1/LotBankingCrux_v_1/Scripts/jquery-ui-1.10.4.js~658ae1b8e0326bee4c927ed3fb90d0d5568e6ab7
	LotBankingCrux_v_1/LotBankingCrux_v_1/Web.config
	LotBankingCrux_v_1/LotBankingCrux_v_1/bin/LotBankingCrux_v_1.dll.config
	LotBankingCrux_v_1/LotBankingCrux_v_1/packages.config
	LotBankingCrux_v_1/packages/jQuery.UI.Combined.1.10.3/Content/Scripts/jquery-ui-1.10.3.js
	LotBankingCrux_v_1/packages/jQuery.UI.Combined.1.10.4/Content/Scripts/jquery-ui-1.10.4.js
	LotBankingCrux_v_1/packages/jQuery.UI.Combined.1.10.4/jQuery.UI.Combined.1.10.4.nuspec