nzhul commit
Merge branch 'master' of https://github.com/fast4y/BattleNetShop

Conflicts:
	BattleNetShop/BattleNetShop.sln
	BattleNetShop/BattleNetShop.v12.suo