WCMS-90 renamed field names so that they will match the new standards with buweb content models
Merge branch 'master' into update_field_names
fixed person factory
fixed person form
Use the latest version of buweb_content_models now that we merged in the new field name changes.
renamed field labels
Merge pull request #13 from biola/update_field_names

WCMS-90 renamed field names