Selecting custom field type
Merge pull request #220 from sharetribe/custom_field_index

Custom field index testing
Merge pull request #221 from sharetribe/new-custom-field-type-select

Selecting custom field type
Category and custom field assosiations
Merge branch 'field-associations' into develop
Delete association test

- We trust that Rails does it's job
Show dropdown in listing page
Merge pull request #222 from sharetribe/show-dropdown

Show dropdown in listing page
Probably fix zeus
Update schema.rb
Save custom field answers
Merge branch 'custom_field_index' into develop

Conflicts:
	db/schema.rb