Merge branch 'master' of https://github.com/blasv/DineOn
Merge branch 'master' of https://github.com/blasv/DineOn
Menu items details can now be viewed using parse info
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster
Merge pull request #192 from zachr81/master

Fixed tests for current user setup
Merge pull request #193 from mrathjen/mMaster

Menu items details can now be viewed using parse info
findbugs fixes
Merge pull request #195 from glee23/master

Restaurant side findbugs fixes
Customer Request test
Fixed Find bug errors
Merge branch 'master' of https://github.com/blasv/DineOn

Conflicts:
	DineOnRestaurantApplication/src/uw/cse/dineon/restaurant/profile/MenuItemsFragment.java
Reverted because we need those fields for testing
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnUserApplication/tests/src/uw/cse/dineon/user/bill/test/CurrentOrderActivityTest.java
	DineOnUserApplication/tests/src/uw/cse/dineon/user/restaurant/home/test/RestaurantHomeActivityTest.java
Style fixes and Customer Request Test.
Updated Restaurant deleteFromCloud to delete the restaurant info
Fixed wrong equality
Merge pull request #196 from mhotan/master

Another attempt to fix Restaurant Find bugs
Changed Storable delete eventually to delete in background
Merge pull request #197 from espeo196/master

Style fixes and Customer Request test.
Merge branch 'master' of https://github.com/blasv/DineOn