Merge branch 'js' of https://github.com/dabbler0/ice_editor_canvas
Merge branch 'master' of https://github.com/dabbler0/ice_editor_canvas
Merge branch 'master' of https://github.com/dabbler0/ice_editor_canvas
Fix for touch