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