Some changes
Merge branch 'master' of https://github.com/nixxa/MarketGid

Conflicts:
	MarketGid.UI/MarketGid.UI.csproj