bugFix_0.2.1
Merge branch 'bugFix_0.2.1'

Conflicts:

KQ.xcworkspace/xcuserdata/qing.xcuserdatad/UserInterfaceState.xcuserstat
e