working on #18 ... compatibility changes
working on #18 ... permissions from user
eol fix
working on #18 ... compatibility changes
Merge branch 'feature/18-permissions-from-user' of github.com:cismet/cids-custom-wuppertal into feature/18-permissions-from-user

Conflicts:
	src/main/java/de/cismet/cids/custom/objectrenderer/wunda_blau/MauerRenderer.java
	src/main/java/de/cismet/cids/custom/objectrenderer/wunda_blau/MauerRenderer_old.form
working on #18 ... compatibility changes
eol fix
Merge branch 'feature/18-permissions-from-user' of github.com:cismet/cids-custom-wuppertal into feature/18-permissions-from-user
#18 minor jalopy changes
Merge branch 'dev' into feature/18-permissions-from-user

Conflicts:
	src/main/java/de/cismet/cids/custom/wunda_blau/search/MeasurementPointWindowSearch.java
close #123 implementation of Password-Switcher Dialog
Merge branch 'feature/123-password-switcher-dialog' into dev