Made it so when user pays a push will be sent to the restaurant.
Merge pull request #231 from jordanmcnea22/master

Read commit messeges
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster

Conflicts:
	DineOnUserApplication/src/uw/cse/dineon/user/bill/CurrentBillFragment.java
Edit Profile Fragments
Redesigned the login/create acct pages for user and restaurant side,
added style sheet
merge with my master branch
changed facebook text back to login
Merge pull request #241 from glee23/master

Redesigned user/restaurant login/create acct pages
Changes to support Image abilties
Added second imrpoved layout for restaurant info
Updates to support creating an image and saving it to the cloud.
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev

Conflicts:
	DineOnRestaurantApplication/res/values/strings.xml
	DineOnRestaurantApplication/src/uw/cse/dineon/restaurant/DineOnRestaurantActivity.java
Added support for location based services for restaurant.
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster
Merge pull request #242 from mrathjen/mMaster

Payment now sends push. Restaurant now support location services.
Added placeholder application icon
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.