Attempted bugfix for document upload
Merge branch 'master' of heroku.com:staging-annotationstudio into la-permissions

Conflicts:
	lib/google_processor.rb
Attempted bugfix for document upload