Emi - various bug fixed
Merge branch 'master' of https://github.com/huahengling/HLA-New-Design