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
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
fixed logout
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