scale swiping interaction
Merge branch 'master' of https://github.com/shinsato/ultme

Conflicts:
	www/js/index.js