Changes made to fix routing on the server
Merge branch 'issue-109' into develop
Fixed routing for server
Merge branch 'issue-110' into develop
Fixed tooltip issue
Merge branch 'issue-108' into develop
Merge branch 'develop'