fix more munis control to work with either touchstart or click
Merge branch 'master' into server_issue_61