commit
Merge branch 'master' of https://github.com/CraigZheng/SocialComic2014

Conflicts:

SocialComic2014.xcodeproj/project.xcworkspace/xcuserdata/craig.xcuserdat
ad/UserInterfaceState.xcuserstate