More User Profile editing.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnLibrary/src/uw/cse/dineon/library/image/ImageIO.java
Merge remote-tracking branch 'upstream/master'
User Profile finished. Email, phone, and password changing functionality
implemented.
Slight layout change to edit profile.
Merge pull request #250 from espeo196/master

Editable User Profile Mk II