update
Merge branch 'master' of https://github.com/rayln1983/Cardwow

Conflicts:

Cardwow.xcodeproj/project.xcworkspace/xcuserdata/rayln.xcuserdatad/UserI
nterfaceState.xcuserstate