Removed dependency on Entity101
Added partOf<Folder, Folder>
Fixed unit tests
Merge remote-tracking branch 'upstream/master' into development