Add location fields to `ConferenceEntity` and the `conferences` database table
Add code to translate location fields between Web/API entities and database entities
Add test data to a conference, specifically location fields
 - Also fix a table renaming issue that somehow got missed in master
Merge pull request #43 from CruGlobal/addl-conference-fields

Addl conference fields
Merge branch 'master' into payments

Conflicts:
	src/main/java/org/cru/crs/model/ConferenceEntity.java