HCSVLAB-352, HCSVLAB-351: Routes and actions
Merge branch 'master' of github.com:IntersectAustralia/hcsvlab

Conflicts:
	config/routes.rb

ALso:
HCSVLAB-351, HCSVLAB-352: patched up the routes, actions and buttons for these.