Updated time logs page to new navigation style
Fixing merge conflicts
Merge branch 'master' of https://github.com/bigWebApps/SherpaDeskMobile