HCSVLAB-635 Change annotation @type and move logic from view to controller
Merge branch 'master' of github.com:IntersectAustralia/hcsvlab