update
Merge branch 'master' of https://github.com/cc98/HZMapHD

Conflicts:
	HZMapHD/ZGSViewController.h
	HZMapHD/en.lproj/MainStoryboard.storyboard
update .gitignore
Update
update
Merge branch 'master' of https://github.com/cc98/HZMapHD