Moved props
Fixed warnings
added
Merge remote-tracking branch 'origin/master'

Conflicts:
	TradeObjects/Properties/AssemblyInfo.cs
	TradeObjects/Properties/Settings.Designer.cs