remove carriage return form SQL queries
fix template recursion
Merge branch 'feature-multi-types' into develop
Merge branch 'release-v1.0.0'