Merge branch 'hotfix/0.2.2'
bumped version
Removed double setting of template

Merge cleanup
Re-add layout property

Merge-hell fix
Merge branch 'hotfix/0.2.3' into develop