Updates to generic models
Merge branch 'master' of https://github.com/GMDSP-Linked-Data/PhaseTwo