trying to fix the pay bill activity onBack situation
Merge branch 'master' of https://github.com/espeo196/DineOn
Style fixes.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnLibrary/src/uw/cse/dineon/library/RestaurantInfo.java
	DineOnRestaurantApplication/src/uw/cse/dineon/restaurant/RestaurantDownloader.java
	DineOnUserApplication/src/uw/cse/dineon/user/login/CreateNewAccountActivity.java
Request.
pack thing
Unused import organization
Merge branch 'master' of https://github.com/blasv/DineOn
Merge branch 'master' of https://github.com/espeo196/DineOn
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster
Merge branch 'master' of https://github.com/blasv/DineOn
Added a progress dialog to the restaurant selection activity
fixed logout
Merge pull request #164 from mrathjen/mMaster

RestaurantInfo pages now pass the object as parables
Merge branch 'master' of https://github.com/blasv/DineOn
fixed comment
Merge branch 'master' of https://github.com/blasv/DineOn

Conflicts:
	DineOnUserApplication/src/uw/cse/dineon/user/restaurantselection/RestaurantInfoFragment.java
Merge pull request #165 from jordanmcnea22/master

fixed logout
Fixed incorrect call to DiningSession constructor
Merge branch 'master' of https://github.com/blasv/DineOn

Conflicts:
	DineOnRestaurantApplication/src/uw/cse/dineon/restaurant/active/RequestListFragment.java