no se que, revisemos
nada
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/modules.xml
	.idea/workspace.xml
	bin/Nest5Business.apk
	bin/classes.dex
	bin/classes/com/google/zxing/integration/android/IntentIntegrator.class
	bin/classes/com/nest5/businessClient/AccountsActivity.class
	bin/classes/com/nest5/businessClient/AddIngredientCategoryForm.class
	bin/classes/com/nest5/businessClient/AddIngredientForm$2.class
	bin/classes/com/nest5/businessClient/AddProductCategoryForm$1.class
	bin/classes/com/nest5/businessClient/AddProductCategoryForm.class
	bin/classes/com/nest5/businessClient/AddProductForm.class
	bin/classes/com/nest5/businessClient/DemoCollectionPagerAdapter.class
	bin/classes/com/nest5/businessClient/DeviceListFragment$1.class
	bin/classes/com/nest5/businessClient/DeviceListFragment.class
	bin/classes/com/nest5/businessClient/Initialactivity$12.class
	bin/classes/com/nest5/businessClient/Initialactivity$13.class
	bin/classes/com/nest5/businessClient/Initialactivity$14.class
	bin/classes/com/nest5/businessClient/Initialactivity$15.class
	bin/classes/com/nest5/businessClient/Initialactivity$16.class
	bin/classes/com/nest5/businessClient/Initialactivity$17.class
	bin/classes/com/nest5/businessClient/Initialactivity$18.class
	bin/classes/com/nest5/businessClient/Initialactivity$19.class
	bin/classes/com/nest5/businessClient/Initialactivity$20.class
	bin/classes/com/nest5/businessClient/Initialactivity$21.class
	bin/classes/com/nest5/businessClient/Initialactivity$22.class

	bin/classes/com/nest5/businessClient/Initialactivity$UploadFileToS3.class
	bin/classes/com/nest5/businessClient/Initialactivity.class
	bin/classes/com/nest5/businessClient/LoginActivity$1.class
	bin/classes/com/nest5/businessClient/LoginActivity.class
	bin/classes/com/nest5/businessClient/SaleAdapter.class
	bin/classes/com/nest5/businessClient/SaleDataSource.class
	bin/classes/com/nest5/businessClient/SelectAddItem.class
	bin/classes/com/nest5/businessClient/Setup.class
	bin/classes/com/nest5/businessClient/Util.class
	bin/resources.ap_