fix paperclip replacing spaces with _ in uploads
fix drop zone to work in single mode
Merge branch 'master' of https://github.com/ndlib/honeycomb

Conflicts:
	app/assets/javascripts/dropzone_configuration.js.coffee
	spec/models/item_spec.rb
added top nav to honeycomb
Pulling in changes to get autocomplete working
re-add commented out spec
create test for FindOrCreateUser
Updating some permission stuff
Fixed user_is_curator(collection) method and wrote tests for SitePermission.
Add routes for adding curators to collections
Add some spacing
Add minor style adjustment for curator discovery tool
Add code to submit form when the user clicks 'Add' to add a curator to a
collection
Add method to set curator for a collection
Add tool and form for adding curators to collections
Add a fake remove button on the curator list
Merge branch 'curator_admin' of github.com:/ndlib/honeycomb into curator_admin

Conflicts:
	app/assets/javascripts/person_search.js.coffee
	app/assets/stylesheets/application.css.sass
	app/controllers/users_controller.rb