Merge branch 'release/0.3.10' into develop
updated orm templates
bumped version
Merge branch 'release/0.3.11'