A number of commits.
Merge branch 'master' of https://github.com/CodeForAfrica/sourceAFRICA

Conflicts:
Gemfile
Gemfile.lock
app/views/layouts/workspace.html.erb
config/document_cloud.yml
Merge branch 'master' of https://github.com/CodeForAfrica/sourceAFRICA

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/workspace.html.erb
	config/document_cloud.yml