Merge branch 'master' into jani

Conflicts:
	src/stalker/GUI.java
	src/stalker/Main.java