Merge branch 'dev' of github.com:cismet/cismap-plugin into dev
Merge branch 'dev' of github.com:cismet/cismap-plugin into dev
Merge branch 'dev' of github.com:cismet/cismap-plugin into dev
Merge branch 'dev' of github.com:cismet/cismap-plugin into dev
Merge branch 'dev' of github.com:cismet/cismap-plugin into dev
#24 in CismapPlugin.initMetaSearch(), start the search and sort the results alphabetically
Merge branch 'bug/24-sort-results-geosearch' into dev
Merge branch 'dev' into feature/25-MetaSearchComponent

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