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

Conflicts:
	LotBankingCrux_v_1/LotBankingCrux_v_1/LotBankingCrux_v_1.csproj