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