window
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	IMGOING/src/net/gringrid/imgoing/Constants.java