Some refinements,possibly resoved bug with multiple touch
Merge branch 'master' of https://github.com/PDSD-2014/popa-patru