Merge branch 'master' of https://github.com/Nieo/teedee

Conflicts:
	teedee-desktop/bin/com/me/teedee/Main.class
	teedee-desktop/src/com/me/teedee/Main.java
Merge branch 'master' of https://github.com/Nieo/teedee
Fixed alot with towers
Bullets are now working better, but some part in MapScreen is still to be fixed.
Merge fix