Fix touch event handling.
Merge branch 'master' of https://github.com/flackr/dungeon

Conflicts:
	server/client/combat-map.html