km
Merge remote-tracking branch 'origin/master'

Conflicts:
	KIV_OS/src/application/ConsoleController.java
	KIV_OS/src/application/ConsoleWindow.fxml
	KIV_OS/src/application/Main.java