Implemented merge function
Merge branch 'feature/octree' of github.com:DelftSolutions/jaws into feature/octree
Added unit test project
Merge branch 'feature/octree' into feature/worldgenerator