Merge branch 'octree' into develop
Fix null pointer exception!
Fixed intendation
Merge branch 'develop' into octree