Squashed commit of the following:

commit feb02f20b638ab4cbcb3882e0e04300fb929c5b7
Merge: 8ab4740 bbcd8b7
Author: Florian Witteler <florian_witteler@gmx.de>
Date:   Wed Oct 22 19:56:15 2014 +0200

    Merge branch 'develop' into WIP

    Conflicts:
    	src/main/scala/de/flwi/antme/kernel/entities/Ant.scala
    	src/main/scala/de/flwi/antme/kernel/server/WorldPlayerProxy.scala
    	src/test/scala/de/flwi/antme/kernel/entities/AntTest.scala

commit 8ab4740fcad37515253b90aaae87b2e7c743caf7
Author: Florian Witteler <florian_witteler@gmx.de>
Date:   Tue Oct 21 22:32:07 2014 +0200

    enough for today