Battle system fixed close #216

Hopefully no more nullpointers. 
Better logging.

Updated server to 0.5.2