Merge remote-tracking branch 'origin/map' into develop

Conflicts:
	src/org/imagine/screensframework/MainWindow.fxml
	src/org/imagine/screensframework/MainWindowController.java