Taxonomy custom_field
Merge branch 'master' of https://github.com/chenboxing/portal

Conflicts:
	app/helpers/taxonomies_helper.rb
	app/views/custom_fields/formats/_taxonomy_edit.html.erb
	db/development.sqlite3
	lib/portal/field_format.rb