<no ticket> Replace "puts" with use of the logger.
Merge branch 'master' of github.com:IntersectAustralia/hcsvlab
Merge branch 'master' of github.com:IntersectAustralia/hcsvlab
Merge branch 'master' of github.com:IntersectAustralia/hcsvlab

Conflicts:
	lib/tasks/fedora_helper.rb
Merge of work with pull
HCSVLAB-291: method to implement the "accept license terms" route
HCSVLAB-291; Jiggery-pokery to allow the user to accept license terms
HCSVLAB-291: Support hierarchy of access types
HCSVLAB-291: Display the licence terms and support various actions upon them
HCSVLAB-291: Addeda route for a user to accept licence terms
HCSVLAB-291; Mystery changes to the schema which, honestly, I don't recall doing.
Merge branch 'master' of github.com:IntersectAustralia/hcsvlab

Conflicts:
	app/controllers/collections_controller.rb