Merge branch 'master' into Development
Feature fix

EntityStrategy
- use of IValueCollection beter supported
Merge branch 'Development'