add ruby zip and start reading uncompressed data
Merge branch 'refs/heads/master' into template_import

* refs/heads/master:
  fix base shuffle to shift instead of pop because it appends content
  add/fix translations
  Bump some Gems to fix some CVE things.
create media from image zip entry
clean up template#import
Merge branch 'refs/heads/master' into template_import

* refs/heads/master:
  make translation key singular for consistency
  add missing translation
add the mysql dependency back
Alter test to use package
use capitalized file name
Downgrade RubyZip to support ruby 1.8
add back mysql dependency
Merge branch 'refs/heads/master' into template_import

* refs/heads/master:
  Clean up an i18n deprecation warning
fix #539 text autosizing
update new location for closure compiler source
Merge pull request #772 from concerto/autosizing_fix

fix autosizing of text by constraining width
Trying to see if not doing a test involving Rack::Test::UploadedFile will help 1.8.7 pass
refactor logic into model
Merge branch 'template_import' of https://github.com/concerto/concerto into template_import

# By August
# Via August
* 'template_import' of https://github.com/concerto/concerto:
  Trying to see if not doing a test involving Rack::Test::UploadedFile will help 1.8.7 pass
Flux it, we're doing it live...
Merge branch 'template_import' of github.com:concerto/concerto into template_import

* 'template_import' of github.com:concerto/concerto:
  refactor logic into model
Merge pull request #769 from concerto/template_import

Template import