modified:   entitydb.py
        load() now expects only strings as input
-s 0 parameter setting
	modified:   ../liblinear/liblinear_wrapper.py
Merge branch 'master' of github.com:zseder/hunmisc

Conflicts:
	hunmisc/db/entitydb.py
Merge remote-tracking branch 'cliqz/master'