Formatted code and small clean ups.
Removed context parameters from RestaurantLocationHolder.
Some code clean-up in MainScreen.java
Merge pull request #31 from shamak/CleanUp

Formatted code, added a check and cleaned up code
Merge branch 'DEV_1.2' into UnnecessaryCharacters

Conflicts:
	UWFoodServices/src/ca/uwaterloo/uwfoodservicesutility/ParseMenuData.java