Refactoring getNavigationTree
to include folders
#105
Merged
getNavigationTree
to include folders
#105