Entity system is working a bit more now
Merge remote-tracking branch 'origin/master'

Conflicts:
	SoD2/src/com/deeep/sod2/entities/Block.java
Entity system is working a bit more now