Merging BASE

Merge branch 'feature/BASE' into develop
Users Modified
Multiple Changes
Merge branch 'feature/REST' of https://github.com/letops/Navix into feature/REST