herp
Merge branch 'master' of github.com:mytcg/GameCardsBB10

Conflicts:
	SurfingSADev/assets/OnAuctionList.qml