removed random 'K'
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/controller/Controller.java
Comments