Edit Profile Fragments
Merge pull request #243 from glee23/master

Added placeholder application icon
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
Merge remote-tracking branch 'upstream/master'

Plus: User profile page with phone number changing and initial
implementation of setting new passwords.
See here: https://www.parse.com/docs/android_guide#users-resetting
for information I found about resetting passwords if we want to do that
at some point.
Some style fixes.
Merge pull request #244 from espeo196/master

Initial User Profile