Merge pull request #5 from goodnighthsu/master

拉数据2014-10-16
1
修复bug

修复线路不显示点，完成三个”看与学”
Merge branch 'pr/14'

Conflicts:
	ShanghaiNaturalHistoryMuseum.xcodeproj/project.pbxproj
tmp