For CFF-eApp and CFF development
Merge branch 'master' of https://github.com/huahengling/HLA-New-Design

Conflicts:
	HLA/HLA/MengCheong_Storyboard_eApp.storyboard