Fixed various collision related bugs null pointer exceptions
Started work on ship builder and new tileset