change goldIcon pos
add show shop control
Merge branch 'masterWX' into originalImg

Conflicts:
	Classes/GameScene.cpp

proj.ios/MyBird.xcodeproj/project.xcworkspace/xcuserdata/yuchen.xcuserda
tad/UserInterfaceState.xcuserstate

conflicts resolved