Merge origin/master

Conflicts:
	logger.klog
	src/com/karmelos/ksimulator/controller/SimController.java