Added some fields as a result of reviewing domain model
Merge branch 'dev' of github.com:k-int/gokb-phase1 into dev
Merge branch 'refs/heads/dev' into develop_steve