changes
Merge branch 'master' of
https://github.com/VarunUmesh/Food-U-NewCode.git

Conflicts:
	res/layout/activity_cuisine_recommendation.xml
	res/layout/activity_search_detail.xml
	src/com/example/foodu/SearchDetail.java
Merge branch 'master' of
https://github.com/VarunUmesh/Food-U-NewCode.git

Conflicts:
	gen/com/example/foodu/R.java
	gen/com/google/android/gms/R.java