Merge branch 'release/0.3.6' into develop
clean up the layout templates for frontend use
bumped version
Merge branch 'release/0.3.7'