Merge pull request #1 from hostnet/master

Merge pull request #2 from hboomsma/master
Conditionally load traits if entity exisits in application
no hostnet repo, in public packages
Merge pull request #4 from hboomsma/feature/conditional_traits

Feature/conditional traits