transferrred
Merge branch 'master' of https://github.com/joroni/MyMobileApp

Conflicts:
	www/index.html