Touch events now properly handled
Merge branch 'development' into gh-pages