made some oop fixes
ש
aF
Merge branch 'master' of https://github.com/icecavegame/Icecave

Conflicts:
	IceCaveProject/src/com/android/icecave/gui/GameActivity.java
	IceCaveProject/src/com/android/icecave/guiLogic/DrawablePlayer.java
Merge branch 'master' of https://github.com/icecavegame/Icecave