Merge remote-tracking branch 'origin/master'

Conflicts:

	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/FacebookSDK/.markers

	.metadata/.plugins/org.eclipse.core.resources/.projects/FacebookSDK/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/FacebookSDK/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Salud Natural
Project/.indexes/a0/d6/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Salud Natural
Project/.indexes/a0/d6/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Salud Natural
Project/.indexes/e4/81/1b/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Salud Natural
Project/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Salud Natural
Project/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Salud Natural
Project/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Salud Natural
Project/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/15.tree
	.metadata/.plugins/org.eclipse.core.resources/.root/16.tree
	.metadata/.plugins/org.eclipse.core.resources/.root/17.tree

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1205420220.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/4.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/6.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/7.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/8.png
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	FacebookSDK/bin/facebooksdk.jar
	Salud Natural Project/bin/R.txt
	Salud Natural Project/bin/Salud Natural Project.apk
	Salud Natural Project/bin/classes.dex
	Salud Natural
Project/bin/classes/com/SaludNaturalApp/ListViewAdapter.class
	Salud Natural
Project/bin/classes/com/SaludNaturalApp/MainFragment$2.class
	Salud Natural
Project/bin/classes/com/SaludNaturalApp/MainFragment.class
	Salud Natural Project/bin/classes/com/SaludNaturalApp/MainMenu$1.class
	Salud Natural Project/bin/classes/com/SaludNaturalApp/MainMenu.class
	Salud Natural Project/bin/classes/com/SaludNaturalApp/R$id.class
	Salud Natural Project/bin/classes/com/SaludNaturalApp/R$integer.class
	Salud Natural Project/bin/classes/com/SaludNaturalApp/R$layout.class
	Salud Natural Project/bin/classes/com/SaludNaturalApp/R$menu.class
	Salud Natural Project/bin/classes/com/SaludNaturalApp/R$string.class
	Salud Natural Project/bin/classes/com/SaludNaturalApp/R$style.class
	Salud Natural Project/bin/classes/com/SaludNaturalApp/R$styleable.class
	Salud Natural
Project/bin/classes/com/SaludNaturalApp/StartActivity.class
	Salud Natural Project/bin/classes/com/facebook/android/R$id.class
	Salud Natural
Project/bin/dexedLibs/appcompat_v7-25e369d1f5002c879fdda02b80fe8c84.jar
	Salud Natural
Project/bin/dexedLibs/facebooksdk-4ee5eedb8c30b3626a249b7f3ef3ac5e.jar
	Salud Natural Project/bin/resources.ap_
	Salud Natural Project/gen/com/SaludNaturalApp/R.java
	Salud Natural Project/gen/com/facebook/android/R.java
	appcompat_v7/bin/appcompat_v7.jar

pantallas menos la de mostrar info de producto
Merge remote-tracking branch 'origin/master'

Conflicts:

	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/FacebookSDK/.markers

	.metadata/.plugins/org.eclipse.core.resources/.projects/FacebookSDK/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/FacebookSDK/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Salud Natural
Project/.indexes/a0/d6/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Salud Natural
Project/.indexes/a0/d6/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Salud Natural
Project/.indexes/e4/81/1b/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Salud Natural
Project/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Salud Natural
Project/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Salud Natural
Project/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Salud Natural
Project/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1205420220.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/4.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/6.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/7.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/8.png
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	FacebookSDK/bin/facebooksdk.jar
	Salud Natural Project/bin/R.txt
	Salud Natural Project/bin/Salud Natural Project.apk
	Salud Natural Project/bin/classes.dex
	Salud Natural
Project/bin/classes/com/SaludNaturalApp/ListViewAdapter.class
	Salud Natural
Project/bin/classes/com/SaludNaturalApp/MainFragment$2.class
	Salud Natural
Project/bin/classes/com/SaludNaturalApp/MainFragment.class
	Salud Natural Project/bin/classes/com/SaludNaturalApp/MainMenu$1.class
	Salud Natural Project/bin/classes/com/SaludNaturalApp/MainMenu.class
	Salud Natural Project/bin/classes/com/SaludNaturalApp/R$id.class
	Salud Natural Project/bin/classes/com/SaludNaturalApp/R$integer.class
	Salud Natural Project/bin/classes/com/SaludNaturalApp/R$layout.class
	Salud Natural Project/bin/classes/com/SaludNaturalApp/R$menu.class
	Salud Natural Project/bin/classes/com/SaludNaturalApp/R$string.class
	Salud Natural Project/bin/classes/com/SaludNaturalApp/R$style.class
	Salud Natural Project/bin/classes/com/SaludNaturalApp/R$styleable.class
	Salud Natural
Project/bin/classes/com/SaludNaturalApp/StartActivity.class
	Salud Natural Project/bin/classes/com/facebook/android/R$id.class
	Salud Natural
Project/bin/dexedLibs/appcompat_v7-25e369d1f5002c879fdda02b80fe8c84.jar
	Salud Natural
Project/bin/dexedLibs/facebooksdk-4ee5eedb8c30b3626a249b7f3ef3ac5e.jar
	Salud Natural Project/bin/resources.ap_
	Salud Natural Project/gen/com/SaludNaturalApp/R.java
	Salud Natural Project/gen/com/facebook/android/R.java
	appcompat_v7/bin/appcompat_v7.jar