changes in entities
Merge branch 'develop' of https://github.com/elmerfreddy/nsiaf into develop