Changed the interface to the static variables. Fixed some checkstyle
warnings and got rid of dead code.
Fixed logic problem
Stupid checkstyle
Merge pull request #230 from mrathjen/mMaster

Changed the interface to the static variables. Fixed some checkstyle
Merge branch 'master' of https://github.com/blasv/DineOn

Conflicts:
	DineOnUserApplication/src/uw/cse/dineon/user/DineOnUserActivity.java
	DineOnUserApplication/src/uw/cse/dineon/user/bill/CurrentBillFragment.java
	DineOnUserApplication/src/uw/cse/dineon/user/bill/CurrentOrderFragment.java
	DineOnUserApplication/src/uw/cse/dineon/user/restaurantselection/RestaurantSelectionActivity.java