this should have been included in previous commit to load add'l conference data.
Change answer value database data type from text to json.
Pages should have field 'title', not 'name' as the title of the page.. per the spec.
- Note a DB build is required with this change as well
Merge branch 'master' of http://github.com/CruGlobal/conf-registration-api
Add parameters to initialize the CORS filter properly to allow the following methods:
 -GET
 -PUT
 -POST
 -HEAD
 -DELETE
 -OPTIONS

And the following request headers
 -Accept
 -Origin
 -Content-Type
Fix NPE when the result set was not null, but the actual JSON object is.
Merge branch 'master' into with-authentication

Conflicts:
	src/main/db/files/cru_crs_conferences.sql
	src/test/java/org/cru/crs/service/AnswerServiceTest.java
	src/test/java/org/cru/crs/service/PageServiceTest.java
Allow the authorization header to go through the CORS filter
The authorization code we check for should be "Authorization", not "Authentication".  Ryan didn't read the manual...
Merge branch 'with-authentication' of http://github.com/CruGlobal/conf-registration-api into with-authentication