fragments for profile.
Merge branch 'master' of https://github.com/espeo196/DineOn
Changed the interface to the static variables. Fixed some checkstyle
warnings and got rid of dead code.
Fixed logic problem
Stupid checkstyle
added the basics for the profile stuff. need to fill in the blanks.
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
Merge pull request #231 from jordanmcnea22/master

Read commit messeges
Edit Profile Fragments
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnUserApplication/res/layout/activity_profile_and_settings.xml
	DineOnUserApplication/src/uw/cse/dineon/user/general/ProfileActivity.java
	DineOnUserApplication/src/uw/cse/dineon/user/general/ProfileFragment.java