Refactored navigation
Merge branch 'develop' of https://github.com/zezutom/apimock into develop