update
Merge branch 'master' of https://github.com/djsantoroniko/testFirstApp

Conflicts:
	assets/www/index.html