project directory fix
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/hro/infdev4/src/main/java/Window.java