modified:   entitydb.py
rb mode when loading a pickle
Merge remote-tracking branch 'zseder/master'