Finally update to the test plan.
Fixed more multitouch issues
Merge branch 'master' of https://github.com/TBITracker/taskplanner
Merge branch 'origin/master'