imports changed for bootstrap 3.2.0

if we do not include bootstrap-sprockets glyphicons will not be present
Add multi file and drag and drop upload with status bar. Remove files widget in favor of modal window approach.
refactor styles
updated config to make travis happy
updated config to make travis happy
handle iframe layout via javascript
moar coffee
Merge branch 'schneikai-upgrade-files'
fixing dependencies
don't need this
Merge branch 'upgrade-files' of git://github.com/schneikai/comfortable-mexican-sofa into schneikai-upgrade-files

Conflicts:
	app/assets/javascripts/comfortable_mexican_sofa/application.js.coffee
	app/assets/stylesheets/comfortable_mexican_sofa/base.css.sass
	app/controllers/comfy/admin/cms/files_controller.rb
	app/views/comfy/admin/cms/files/_modal.html.haml
	app/views/layouts/comfy/admin/cms/_body.html.haml
Merge branch 'schneikai-upgrade-files'
removing dead code, adding autoresize to tinymce
Making snippets use codemirror again. Adding a pile of generators if somebody needs to easily change things. Addresses #489
nesting generators
generators are properly hooked up
relaxing gem dependencies
Merge remote-tracking branch 'upstream/master'

* upstream/master: (35 commits)
  relaxing gem dependencies
  generators are properly hooked up
  nesting generators
  Making snippets use codemirror again. Adding a pile of generators if somebody needs to easily change things. Addresses #489
  removing dead code, adding autoresize to tinymce
  don't need this
  fixing dependencies
  Update form_builder.rb
  Updated dependecy
  handle iframe layout via javascript
  updated config to make travis happy
  updated config to make travis happy
  refactor styles
  Add multi file and drag and drop upload with status bar. Remove files widget in favor of modal window approach.
  i like my reorder method, related to #479
  cleanup and tests related to #505
  adding site.url method
  making sure that the public cms prefix path is reflected in the page.url method. fixes #500
  moving code around
  categories defined in page/file/snippet fixtures are linkages, they won't auto-create categories in main pool. fixes #518
  ...

Conflicts:
	test/gemfiles/Gemfile.rails.4.0
	test/gemfiles/Gemfile.rails.4.1
	test/gemfiles/Gemfile.rails.master
Merge branch 'master' into develop

* master:
  relaxing gem dependencies
  generators are properly hooked up
  nesting generators
  Making snippets use codemirror again. Adding a pile of generators if somebody needs to easily change things. Addresses #489
  removing dead code, adding autoresize to tinymce
  don't need this
  fixing dependencies
  handle iframe layout via javascript
  updated config to make travis happy
  updated config to make travis happy
  refactor styles
  Add multi file and drag and drop upload with status bar. Remove files widget in favor of modal window approach.
  imports changed for bootstrap 3.2.0

Conflicts:
	app/assets/javascripts/comfortable_mexican_sofa/application.js.coffee