Updated keyboard view to display touch events properly, in addition to press events
Resolving merge conflict
Merge branch 'master' of https://github.com/asweingarten/TSK