Standardized names for coordinates.
Merge branch 'DEV_1.1' of https://github.com/shamak/FoodMenuUW into DEV_1.1

Conflicts:
	UWFoodServices/src/ca/uwaterloo/uwfoodservices/Coordinates.java
	UWFoodServices/src/ca/uwaterloo/uwfoodservices/ImageAdapter.java