Updated to match new coding styles.
Merge branch 'dev-feature-EntityManager' into dev