large refactorings, now able to add Collections, add content items to StaticCollection, define ContentSearch criteria for DynamicCollections