Carga de productos
Merge branch 'master' of https://github.com/CeroyUno/PrimeraAPP

Conflicts:
	assets/www/index.html
	bin/example.apk
	bin/resources.ap_