Custom dropdown field has 2 options by default when adding new field
Merge branch 'develop' of https://github.com/sharetribe/sharetribe into develop

Conflicts:
	app/controllers/admin/custom_fields_controller.rb