Touch + Mouse code + test cleanup
Merge pull request #331 from Birkemose/touch

Touch + Mouse code + test cleanup