Merge branch 'development' of https://github.com/hyperstudio/Annotation-Studio into development

Conflicts:
	app/assets/javascripts/application.js
	app/controllers/users_controller.rb
	app/views/documents/_annotator-setup.html.erb
	vendor/assets/javascripts/annotator.min.js
	vendor/assets/stylesheets/annotator.min.css