fixed #25 metasearch component
#25 adaptations related to cismet/cismap-commons/#64
Merge branch 'dev' into feature/25-MetaSearchComponent

Conflicts:
	src/main/java/de/cismet/cismap/navigatorplugin/CismapPlugin.java