minor jalopy changes
fixes #136 : turn off CallServerTunnel if jnlp.intranetUse==true
Merge branch 'dev' of github.com:cismet/cids-custom-wuppertal into dev
fixes #136 : turn off CallServerTunnel if jnlp.intranetUse==true
Merge branch 'feature/136-intranetUse-parameter' of github.com:cismet/cids-custom-wuppertal into feature/136-intranetUse-parameter
Merge branch 'feature/136-intranetUse-parameter' into dev