Merge branch 'batl_hldi' into 'master'

Updated the HLDI of BATL DB, added FunnyEyes fix, and protocol joining test and dev sets

See merge request !65