only show field name instead of kind name since a field can be associated with multiple kinds
support multiple kinds per field
add new fields during import
fixture with new field
Merge branch 'refs/heads/master' into mulitple_kinds_per_field

* refs/heads/master:
  Flux it, we're doing it live...
  refactor logic into model
  Trying to see if not doing a test involving Rack::Test::UploadedFile will help 1.8.7 pass
  update new location for closure compiler source
  fix #539 text autosizing
  add back mysql dependency
  Downgrade RubyZip to support ruby 1.8
  use capitalized file name
  Alter test to use package
  add the mysql dependency back
  clean up template#import
  create media from image zip entry
  add ruby zip and start reading uncompressed data
merging master into this to bring it up to date
resequence migration so runs
Merge pull request #1 from mfrederickson/mulitple_kinds_per_field

Mulitple kinds per field