actually, don't bother merging the files, i've commited a new revision that includes the fix attempt.
Revision 336 commited :
-crime system update part 1,
-lair rebalance,
-ppq's navy graphic module,
-fixes and tweaks,
-attempt to kill the python bug