Merge branch 'master' into template_nodes
Merge branch 'template_nodes' of github.com:structr/structr into template_nodes
Merge branch 'template_nodes' of github.com:structr/structr into template_nodes