changed haptic functions, started adapting testcase
Merge branch 'master' of https://github.com/jobtalle/ccore