Merge pull request #73 from rhokbrisbane/t12125-add-fields-to-people

T12125 add fields to people
Merge branch 'master' into t12122-add-fields-to-resource

Conflicts:
	db/schema.rb
Merge pull request #74 from rhokbrisbane/t12122-add-fields-to-resource

T12122 add fields to resource
Merge branch 'master' into t12124-group-resources-by-categories-tags

Conflicts:
	db/schema.rb