Map, not working though
Merge remote-tracking branch 'origin/master'

Conflicts:
	SoD2/src/com/deeep/sod2/entities/TickAbleEntity.java
Map, not working though