Attempt to Fix all
Merge branch 'master' of https://github.com/blasv/DineOn into UI_Phase2
Merge branch 'master' of https://github.com/blasv/DineOn into UI_Phase2
Added a change in title in the restaurant selection screen
worked the layout portion of restaurant Application
Fixed Everything so that it works
Merge pull request #55 from espeo196/master

New version of onSaved/RestoreInstanceState using Parcelable.
Mikes first Merge, Hey that wasn't so bad
Merge pull request #56 from mhotan/UI_Phase2

Temporary Fix
Merge branch 'UI_Phase2' of https://github.com/blasv/DineOn

Conflicts:
	DineOnUserApplication/src/uw/cse/dineon/user/DineOnUserActivity.java
Cleaned up the layouts for menu items, restaurant info, and the user
profile page.
Merge pull request #57 from glee23/phase2layout

Cleaned up the layouts for menu items, restaurant info, and the user profile page.
Cleans up action bar menu icons.
Merge pull request #59 from glee23/master

Cleaned up the action bar menu icons.
Cleaned up restaurant selection buttons
Merge pull request #60 from glee23/master

Cleaned up the restaurant selection icons.
Cleaned up restaurant info page buttons.
Merge pull request #61 from glee23/master

Cleaned up the restaurant info buttons.
Fixed merge errors with Restaurant and User changes, implemented Parse
and Parcel methods
Added some images to possibly use, and add credential validator for
passwords and username.