Resolution bug list plat
Merge manuel
Commit
Merge branch 'master' of
https://github.com/anthonygego/UCL-SINF1225-GR4-Gourmet.git

Conflicts:
	Fooddroid/gen/com/fooddroid/R.java
	Fooddroid/src/com/fooddroid/ListReservationActivity.java
	Fooddroid/src/com/fooddroid/PreferenceActivity.java