Emi - Bug fixed: 3108, 3102, 3100, 3110
Merge branch 'master' of https://github.com/huahengling/HLA-New-Design