Merge branch 'upgrade-files' into develop

* upgrade-files:
  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.

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