Tests.
Fixing branches 2.0.
merge branch 'backend'

Conflicts:
	Gemfile
	README.md
	app/controllers/backend/file_records_controller.rb
	app/controllers/file_records_controller.rb
	app/controllers/people_controller.rb
	app/views/layouts/backend/application.html.erb
	app/views/offices/index.html.erb
	app/views/people/index.html.erb
	config/routes.rb