Satya - Bug fixes

Existing policy crash, Existing policy tag null, Trustee tag null
Merge branch 'master' of https://github.com/huahengling/HLA-New-Design