C
Commit
Merge branch 'master' of https://github.com/kinxz/Canopus.git

Conflicts:
	Canopus/bin/de/datpixelstudio/canopus/Canopus.class
	Canopus/bin/de/datpixelstudio/canopus/Main.class
	Canopus/bin/de/datpixelstudio/canopus/states/InputHandlerMaus.class
	Canopus/bin/de/datpixelstudio/canopus/states/MenueState.class
Merge branch 'master' of https://github.com/kinxz/Canopus.git
Merge branch 'master' of https://github.com/kinxz/Canopus.git

Conflicts:
	Canopus/canopus/src/de/datpixelstudio/canopus/states/Box2DTestState.java