Saving the following fields to the database on updates
- authnetId
- earlyRegistrationAmount
- earlyRegistrationCutoff
- conferenceCost
- acceptCreditCards
- authnetToken
- earlyRegistrationDiscount
Add description field to conference database table, JPA entity and API object.
Add additional fields on the Conference table, JPA entity and web model object for:
- Contact Person Name
- Contact Person Email
- Contact Person Phone

These fields are separate from the user object b/c it is perfectly reasonable that the administrator might want to list someone other than him/herself as the contact person
Add the defaulting of contact person fields to the logged in user when creating a conference.
 - Also, add phone number to user table
Merge branch 'master' into conference-details
Merge branch 'master' into conference-details

Conflicts:
	src/main/java/org/cru/crs/api/model/Conference.java
	src/main/java/org/cru/crs/service/ConferenceService.java
	src/test/java/org/cru/crs/service/BlockServiceTest.java
	src/test/java/org/cru/crs/service/ConferenceServiceTest.java
	src/test/java/org/cru/crs/service/PageServiceTest.java
Merge pull request #47 from CruGlobal/conference-details

Conference details