Working on AddDishReview section.
Working on AddDishReview section.
Working on AddDishReview section.
...
...
...
Implementing Parse Database.
Implementing Parse Database.
Implemented the Add review feature.
...
Merge branch 'AddDishReview'

Conflicts:
	ristaurants/build/bin/classes.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/adapters/DishReviewsAdapter.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/adapters/DishReviewsAdapter.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/adapters/NaviDrawerLeftAdapter.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/adapters/NaviDrawerLeftAdapter.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/adapters/RestaurantMenuAdapter.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/adapters/RestaurantMenuAdapter.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/adapters/RestaurantsAdapter$100000000.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/adapters/RestaurantsAdapter$100000000.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/adapters/RestaurantsAdapter$100000001.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/adapters/RestaurantsAdapter$100000001.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/adapters/RestaurantsAdapter$100000002.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/adapters/RestaurantsAdapter$100000002.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/adapters/RestaurantsAdapter$ViewHolder.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/adapters/RestaurantsAdapter$ViewHolder.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/adapters/RestaurantsAdapter.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/adapters/RestaurantsAdapter.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/BaseActivity.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/BaseActivity.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/CuisineFrag.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/CuisineFrag.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/DishesFrag.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/DishesFrag.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/DishesReviews.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/DishesReviews.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/FlavorsFrag.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/FlavorsFrag.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$array.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$array.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$attr.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$attr.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$color.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$color.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$dimen.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$dimen.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$drawable.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$drawable.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$id.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$id.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$layout.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$layout.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$menu.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$menu.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$string.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$string.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$style.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R$style.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/R.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/RestaurantMenuActivity.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/RestaurantMenuActivity.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/RestaurantMenuFrag.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/RestaurantMenuFrag.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/RestaurantsFrag$100000000.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/RestaurantsFrag$100000000.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/RestaurantsFrag$100000001.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/RestaurantsFrag$100000001.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/RestaurantsFrag$100000002.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/RestaurantsFrag.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/RestaurantsFrag.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/SettingsFrag.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/app/SettingsFrag.dex
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/misc/HelperClass.class
	ristaurants/build/bin/classes2/com/ristaurants/ristaurants/misc/HelperClass.dex
	ristaurants/build/bin/jardex/android-support-v4.jar.dex
	ristaurants/build/bin/jardex/volley.jar.dex
	ristaurants/build/bin/resources.ap_
	ristaurants/build/bin/ristaurants.apk
	ristaurants/build/gen/com/ristaurants/ristaurants/app/R.java