Swapped TestUtility to live in the Library instead of the old
semi-working one. Also, some style fixes.
Merge remote-tracking branch 'upstream/master'
User edit profile layout.
fragments for profile.
Merge branch 'master' of https://github.com/espeo196/DineOn
added the basics for the profile stuff. need to fill in the blanks.
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
merge with my master branch