checkout conflicts
Merge branch 'master' of
https://github.com/tecnomatico/JujuyCommerces.git

Conflicts:
	bin/JujuyCommerces.apk
	bin/classes.dex
	bin/classes/co/tecnomati/layouts/HiScreen.class
	bin/classes/co/tecnomati/util/Publicidad.class
	bin/resources.ap_