Merge branch 'export_with_security_1420' of git://github.com/harshac/RapidFTR into harshac-export_with_security_1420

Ref pull requests #388 and #345

Conflicts:
	app/controllers/children_controller.rb
	config/routes.rb
	public/javascripts/translations.js
	spec/controllers/children_controller_spec.rb