Merge branch 'dev' of github.com:cismet/cids-custom-wuppertal into dev
Merge branch 'dev' of github.com:cismet/cids-custom-wuppertal into dev
Merge branch 'dev' of github.com:cismet/cids-custom-wuppertal into dev
#124 using new custom nas point server search
fixed #124, invoking fee calculation only once if anything has changed to only get one error message if anything goes wrong
Merge branch 'bug/124-custom-nas-point-search' into dev
Merge branch 'dev' of github.com:cismet/cids-custom-wuppertal into dev
Merge branch 'dev' of github.com:cismet/cids-custom-wuppertal into dev
Merge branch 'dev' of github.com:cismet/cids-custom-wuppertal into dev
fixed #135
Merge branch 'bug/135-permission-check-for-butler-and-nas-startup-hook' into dev
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