Added touch controls and a common controller interface
Merge branch 'master' into gh-pages
New version with touch controls