Merge branch 'master' of https://github.com/DigohD/CR

Conflicts:
	src/com/cr/engine/graphics/Window.java