Updated / fixed archetypes.
Merge branch 'develop' of github.com:/structr/structr into develop