優化
Merge branch 'master' of https://github.com/LiYiBin/NetworkedLifeWithFB

Conflicts:
	NetworkedLifeWithFB/MapView.xib