Added very basic mouse/touch input
Merge branch 'master'