permissions initial work
Merge branch 'master' into permissions
added pdf validation and display, people not logged in only see published docs, relevant_title resolution
resolved conflict in _show_text
commit before merging in showDoc
Merge remote-tracking branch 'origin/showDoc' into permissions

Conflicts:
	app/views/documents/_show_text.html.haml
fixing bugs caused in spec tests due to permission changes
Merge branch 'permissions' of github.com:Berkeley169/fight_Impunity_Haiti into permissions

Conflicts:
	app/views/documents/_show_text.html.haml
Merge branch 'master' of github.com:Berkeley169/fight_Impunity_Haiti into permissions

Conflicts:
	app/assets/stylesheets/application.css
	app/views/documents/index.html.haml
edit permissions nearly done

Just need to polish views and make sure cukes pass
cuke tests for this branch are passing. Maybe time to refactor soon, though?
fixing typo in translations by adding a close-paren
Merge branch 'permissions' into staging
working on tags and translating tags
Merge branch 'ui' into staging-dev

Conflicts:
	app/assets/stylesheets/application.css
	app/helpers/application_helper.rb
	app/views/documents/_document_quickview.html.haml
	app/views/documents/index.html.haml
adding more translations
making the tag words random so they don't collide in the database
Merge branch 'tags' of github.com:Berkeley169/fight_Impunity_Haiti into staging-dev

Conflicts:
	config/locales/en.yml
	config/locales/es.yml
	config/locales/fr.yml
	config/locales/ht.yml
downcasing locales
editing contact form