HCSVLAB-840: Changed item url from /catalog/collection:itemId to /catalog/collection/itemId
Merge branch 'master' of https://github.com/IntersectAustralia/hcsvlab

Conflicts:
	features/lockout_after_failed_login_attempts.feature
HCSVLAB-843: Changed collection url from /collections/:Id to /catalog/:id. Also redirected /catalog to point to the collections page instead of the root page.
HCSVLAB-846: Changed collections home page text.