Merge.
Merge branch 'develop' of github.com:/structr/structr into develop
Merge branch 'develop' of github.com:/structr/structr into develop
Merge branch 'develop' of github.com:/structr/structr into develop
Added null-filter in merge() builtin function, modified NotionPropertyParser to use
PropertySetNotion or PropertyNotion depending on the number of notion properties,
added check to prevent multiple concurrent compilations of the schema to
SchemaService.
Merge branch 'develop' of github.com:/structr/structr into develop