commited
Merge remote-tracking branch 'origin/master'

Conflicts:
	myApp/www/index.html