Add scan events
Merge branch 'manateeworks' of github.com:wipon/mobile-app into manateeworks

Conflicts:
	www/index.html
fix bugs