welcome background and concern checkbox
Merge branch 'master' of https://github.com/BaobabHealthTrust/HCSA

Conflicts:
	app/controllers/admin_controller.rb
	app/views/layouts/barcode.rhtml
	app/views/report/general_report.html.erb
	app/views/votes/concerns.rhtml
	app/views/votes/language_select.rhtml
	app/views/votes/serviceselect.rhtml