stuff
Merge branch 'master' of https://github.com/FuryFurious/KaiJaScroller

Conflicts:
	KaiJaScroller/Classes/ComponentCollection/Brains/PlayerBrain.cs
	KaiJaScroller/Classes/Entity.cs
	KaiJaScroller/Classes/GameTemplate/Gamepad.cs
	KaiJaScroller/Classes/Statics/Help.cs