locale selection includes user language preference, document index shows relevant title, user dropdown became sidebar
merged before 5:00 pm
javascript to render one text/resource at a time, added omnipresent user sidebar and javascript to make it fit, fixed small edit profile bug
resolved conflict in show document page
documents_helper_spec doesn't care about published status, pages_controller_spec stubs current_user
adding google analytics to the site. Fixes #55
Merge branch 'master' of https://github.com/Berkeley169/fight_Impunity_Haiti
fixing a bug
adding more translations
Merge branch 'master' of github.com:Berkeley169/fight_Impunity_Haiti

Conflicts:
	app/helpers/documents_helper.rb
	app/views/pages/home.html.haml
	app/views/partials/_navigation.html.haml
fixing the photos so they show the correct thing
changed security token to be set in the env
fixing one spec that was failing
changed devise security key to pull from the env
removed key from file
fixing a cuke test
Merge branch 'master' of github.com:Berkeley169/fight_Impunity_Haiti
Merge branch 'security'
decreasing new complexity slightly
Merge branch 'master' of https://github.com/Berkeley169/fight_Impunity_Haiti