test
Merge branch 'master' of https://github.com/binaryferret/towerdef_xmashack_2013

Conflicts:
	towerDefense/TowerDefense/AndroidManifest.xml
	towerDefense/TowerDefense/src/xmas/hack/towerdefense/GameSurfaceView.java
	towerDefense/TowerDefense/src/xmas/hack/towerdefense/dialog/TowerSelectDialog.java
	towerDefense/TowerDefense/src/xmas/hack/towerdefense/entities/Entity.java
	towerDefense/TowerDefense/src/xmas/hack/towerdefense/level/Level.java
Merge branch 'master' of https://github.com/binaryferret/towerdef_xmashack_2013
Background color :(