Added option for mouse input
Correct merge conflicts.
Merge branch 'master' of https://github.com/Mrparkers/MyoPaint