put touchstart and touchcancel in function
Merge branch 'master' of https://github.com/evotech/MarexPOC

Conflicts:
	app/controllers/mainMenu.js
	app/views/mainMenu.xml