before merging mahdi's changes
Merge branch 'test' into working-copy

Conflicts:

IDK3/IDK3.xcodeproj/project.xcworkspace/xcuserdata/satoko.xcuserdatad/Us
erInterfaceState.xcuserstate
holding

working but no event returned.
and picker still needs to be implemented.
changed some ui