By Benjamin
Merge branch 'master' of https://github.com/huahengling/HLA-New-Design

Conflicts:
	HLA/HLA/PolicyOwner.m
	HLA/HLA/SubDetails.m