test toasts
Merge branch 'master' of https://github.com/blasv/DineOn
Merge branch 'master' of https://github.com/blasv/DineOn
Merge branch 'master' of https://github.com/blasv/DineOn
Merge branch 'master' of https://github.com/blasv/DineOn
all got -o'ed
Merge branch 'master' of https://github.com/blasv/DineOn
Implemented RestaurantMainActivityTest tests -- commented out one will
pass once onOrderRequestDetail
Added more tests.
Commented out test
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster
Merge branch 'master' of https://github.com/blasv/DineOn
Merge pull request #178 from glee23/master

Implemented RestaurantMainActivity tests
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/espeo196/DineOn

Conflicts:
	DineOnUserApplication/src/uw/cse/dineon/user/DineOnUserActivity.java
	DineOnUserApplication/src/uw/cse/dineon/user/bill/CurrentOrderActivity.java
Merge branch 'master' of https://github.com/blasv/DineOn
Updated RestaurantSelection test for a method change in activity
Restaurant Home page now uses real data from cloud. No static default
data
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster