Recipes By Ingredient
Merge branch 'Rama-Vivi-Android' into Rama-Android

Conflicts:
	KitchApp/.classpath
	KitchApp/AndroidManifest.xml
	KitchApp/bin/KitchApp.apk
	KitchApp/bin/R.txt
	KitchApp/bin/classes.dex
	KitchApp/bin/classes/android/support/v7/appcompat/R$drawable.class
	KitchApp/bin/classes/android/support/v7/appcompat/R$layout.class
	KitchApp/bin/classes/com/example/kitchapp/AccesoDespensa.class
	KitchApp/bin/classes/com/example/kitchapp/AddManualmente$1.class
	KitchApp/bin/classes/com/example/kitchapp/AddManualmente.class
	KitchApp/bin/classes/com/example/kitchapp/Bar_Search.class
	KitchApp/bin/classes/com/example/kitchapp/Handler_Sqlite.class
	KitchApp/bin/classes/com/example/kitchapp/ItemProducto.class
	KitchApp/bin/classes/com/example/kitchapp/ItemProductoAdapter.class
	KitchApp/bin/classes/com/example/kitchapp/Login$1.class
	KitchApp/bin/classes/com/example/kitchapp/Login$HttpAsyncTask.class
	KitchApp/bin/classes/com/example/kitchapp/Login.class
	KitchApp/bin/classes/com/example/kitchapp/MostrarProductosCategoria$1.class
	KitchApp/bin/classes/com/example/kitchapp/MostrarProductosCategoria$2.class
	KitchApp/bin/classes/com/example/kitchapp/MostrarProductosCategoria$3.class
	KitchApp/bin/classes/com/example/kitchapp/MostrarProductosCategoria$4.class
	KitchApp/bin/classes/com/example/kitchapp/MostrarProductosCategoria$5.class
	KitchApp/bin/classes/com/example/kitchapp/MostrarProductosCategoria$6.class
	KitchApp/bin/classes/com/example/kitchapp/MostrarProductosCategoria$7.class
	KitchApp/bin/classes/com/example/kitchapp/MostrarProductosCategoria$8.class
	KitchApp/bin/classes/com/example/kitchapp/MostrarProductosCategoria$9.class
	KitchApp/bin/classes/com/example/kitchapp/MostrarProductosCategoria.class
	KitchApp/bin/classes/com/example/kitchapp/PantallaPrincipal.class
	KitchApp/bin/classes/com/example/kitchapp/PantallaTransicion$AccesoBBDD.class
	KitchApp/bin/classes/com/example/kitchapp/PantallaTransicion.class
	KitchApp/bin/classes/com/example/kitchapp/R$drawable.class
	KitchApp/bin/classes/com/example/kitchapp/R$id.class
	KitchApp/bin/classes/com/example/kitchapp/R$integer.class
	KitchApp/bin/classes/com/example/kitchapp/R$layout.class
	KitchApp/bin/classes/com/example/kitchapp/R$menu.class
	KitchApp/bin/classes/com/example/kitchapp/R$string.class
	KitchApp/bin/classes/com/example/kitchapp/R$style.class
	KitchApp/bin/classes/com/example/kitchapp/R$styleable.class
	KitchApp/bin/classes/com/example/kitchapp/Registro$1.class
	KitchApp/bin/classes/com/example/kitchapp/Registro$2.class
	KitchApp/bin/classes/com/example/kitchapp/Registro$3.class
	KitchApp/bin/classes/com/example/kitchapp/Registro$4.class
	KitchApp/bin/classes/com/example/kitchapp/Registro$5.class
	KitchApp/bin/classes/com/example/kitchapp/Registro$6.class
	KitchApp/bin/classes/com/example/kitchapp/Registro$HttpAsyncTask.class
	KitchApp/bin/classes/com/example/kitchapp/Registro$HttpGetEmail$1.class
	KitchApp/bin/classes/com/example/kitchapp/Registro$HttpGetEmail.class
	KitchApp/bin/classes/com/example/kitchapp/Registro$HttpGetName$1.class
	KitchApp/bin/classes/com/example/kitchapp/Registro$HttpGetName.class
	KitchApp/bin/classes/com/example/kitchapp/Registro.class
	KitchApp/bin/classes/com/example/kitchapp/ShoppingListAdapter.class
	KitchApp/bin/classes/com/example/kitchapp/ShoppingLists$1.class
	KitchApp/bin/classes/com/example/kitchapp/ShoppingLists$2.class
	KitchApp/bin/classes/com/example/kitchapp/ShoppingLists$3.class
	KitchApp/bin/classes/com/example/kitchapp/ShoppingLists$4.class
	KitchApp/bin/classes/com/example/kitchapp/ShoppingLists$5.class
	KitchApp/bin/classes/com/example/kitchapp/ShoppingLists$6.class
	KitchApp/bin/classes/com/example/kitchapp/ShoppingLists.class
	KitchApp/bin/resources.ap_
	KitchApp/project.properties
	KitchApp/res/layout/activity_acceso_despensa.xml
	KitchApp/res/layout/activity_add_manualmente.xml
	KitchApp/res/layout/activity_bar_search.xml
	KitchApp/res/layout/activity_fragment_favorites.xml
	KitchApp/res/layout/activity_fragment_recipes.xml
	KitchApp/res/layout/activity_fragment_topten.xml
	KitchApp/res/layout/activity_item_listview.xml
	KitchApp/res/layout/activity_item_listviewrec.xml
	KitchApp/res/layout/activity_list_item_layout.xml
	KitchApp/res/layout/activity_login.xml
	KitchApp/res/layout/activity_modificar_producto_despensa.xml
	KitchApp/res/layout/activity_mostrar_categoria_recetas.xml
	KitchApp/res/layout/activity_mostrar_productos_categoria.xml
	KitchApp/res/layout/activity_pantalla_principal.xml
	KitchApp/res/layout/activity_pantalla_transicion.xml
	KitchApp/res/layout/activity_recipes_viewpager.xml
	KitchApp/res/layout/activity_seleccionar_categoria.xml
	KitchApp/res/layout/activity_shopping_lists.xml
	KitchApp/res/layout/activity_una_lista.xml
	KitchApp/res/layout/button_style_main_activity.xml
	KitchApp/res/layout/cabecera.xml
	KitchApp/res/layout/dialog_matches.xml
	KitchApp/res/layout/pie_de_pagina.xml
	KitchApp/res/layout/shopping_list_go.xml
	KitchApp/res/layout/shoppinglist_item.xml
	KitchApp/res/values-v14/styles_mystyleactionbar.xml
	KitchApp/res/values/styles_mystyleactionbar.xml
	KitchApp/src/com/example/kitchapp/Bar_Search.java
	KitchApp/src/com/example/kitchapp/BarcodeScanner.java
	KitchApp/src/com/example/kitchapp/Fragment_Favorites.java
	KitchApp/src/com/example/kitchapp/Handler_Sqlite.java
	KitchApp/src/com/example/kitchapp/ItemAdapter.java
	KitchApp/src/com/example/kitchapp/ItemProducto.java
	KitchApp/src/com/example/kitchapp/ItemRecetaAdapter.java
	KitchApp/src/com/example/kitchapp/Login.java
	KitchApp/src/com/example/kitchapp/MostrarProductosLista.java
	KitchApp/src/com/example/kitchapp/PantallaPrincipal.java
	KitchApp/src/com/example/kitchapp/PantallaTransicion.java
	KitchApp/src/com/example/kitchapp/Recipes.java