Allow menu interaction on touchscreens
fix touchscreen interaction
touchscreen interaction ACTUALLY working
load conflicts from local file
Merge branch 'master' into embedded