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

Conflicts:
	HLA/iMobile Planner.xcodeproj/project.pbxproj