fix links in navigation.jsp
Merge remote-tracking branch 'origin/develop' into develop