Fixing table name in setup script.
Add a check to make sure the retrieved "content" is not null
Add information for storing basic conference costs
 - Database script added for conference_costs table
 - Database script updated for conferences table to store foreign key to conference_costs
 - JPA Entity added `ConferenceCostsEntity`
 - JPA entity 'ConfereneEntity` updated to include `ConferenceCostsEntity`
 - Database build script updated to build conference_costs table
Add conference_costs_blocks relation(table) and associated JPA
 - Add conference_costs_blocks to database build script
Fix bug in JsonUserType that returns null when it shouldn't.
 - It has something to do with adding the OneToOne where that relation is null.  The rs.wasNull() method returns true, when in fact it should return false
 - I should analyze code snippets borrowed from stack overflow more closely before using them.
Merge branch 'master' into payments

Conflicts:
	src/main/java/org/cru/crs/model/ConferenceEntity.java
Adding @Transient annotation to not pull in the details on blocks that affect payments.  The database can handle it, but we're not ready to handle the complexity in the code just yet
Link up conference costs fields with northern michigan conference
Add payment related fields to the web `Conference` model class.  When asking for a conference, payment related details are now pulled down.
Merge pull request #44 from CruGlobal/payments

Payments