Read ChangeLog.txt
See ChangeLog
Bad pull screwed my files, correcting
Modified changelog
Merge https://github.com/bagofkittens/ScrumGame

Conflicts:
	ScrumGame-android/assets/art/UiElements.psd
	ScrumGame/src/application/LevelData.java
	ScrumGame/src/application/MainGame.java
	ScrumGame/src/data/Player.java
	ScrumGame/src/view/Drawer.java
	ScrumGame/src/view/TextureRepository.java