Merge branch 'release/0.3.13' into develop
opened template for custom fields at the end
bumped version
Merge branch 'release/0.3.14'