nothing
merge working-2
add appi
merge working-1
nothing
Merge branch 'master'

Conflicts:

ShaiWaWa.xcworkspace/xcuserdata/Carl_Huang.xcuserdatad/UserInterfaceStat
e.xcuserstate
Merge branch 'master' into working-2
do all kinds of button Touch Event conn to pos method