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

Conflicts:

AnryBird.xcodeproj/project.xcworkspace/xcuserdata/rayln.xcuserdatad/User
InterfaceState.xcuserstate