Window

fixed a few things
Merge remote-tracking branch 'origin/master'

Conflicts:
	GhettoClue/GhettoClue.v11.suo