Changes for entity model support
Merge branch 'master' of git@github.com:Dexels/navajo.git