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

Conflicts:
	SurfingSADev/src/customcomponents/ShopItemFactory.cpp
derp
Merge branch 'master' of github.com:mytcg/GameCardsBB10

Conflicts:
	SurfingSADev/src/functionality/AlbumView.cpp
shop + auction
Merge branch 'master' of github.com:mytcg/GameCardsBB10

Conflicts:
	SurfingSADev/assets/Auction.qml
	SurfingSADev/assets/InviteFriend.qml
	SurfingSADev/assets/Redeem.qml
	SurfingSADev/x86/Makefile
	SurfingSADev/x86/Makefile.Debug
	SurfingSADev/x86/Makefile.Release
	SurfingSADev/x86/o-g/.moc/moc_Album.cpp
	SurfingSADev/x86/o-g/.moc/moc_AlbumView.cpp
	SurfingSADev/x86/o-g/.moc/moc_Auction.cpp
	SurfingSADev/x86/o-g/.moc/moc_Credits.cpp
	SurfingSADev/x86/o-g/.moc/moc_Friends.cpp
	SurfingSADev/x86/o-g/.moc/moc_InviteFriend.cpp
	SurfingSADev/x86/o-g/.moc/moc_Login.cpp
	SurfingSADev/x86/o-g/.moc/moc_Notifications.cpp
	SurfingSADev/x86/o-g/.moc/moc_Redeem.cpp
	SurfingSADev/x86/o-g/.moc/moc_Shop.cpp
	SurfingSADev/x86/o-g/.moc/moc_SurfingSADev.cpp
	SurfingSADev/x86/o-g/.obj/SurfingSADev.gch/c++
	SurfingSADev/x86/o-g/.obj/SurfingSADev.o
	SurfingSADev/x86/o-g/.obj/moc_SurfingSADev.o
	SurfingSADev/x86/o-g/SurfingSADev
wawawa