Refactoring main navigation
Merge branch 'master' of https://github.com/techdivision/TechDivision_AppserverIo