新增
MapIconView
1、标本背后的故事，区分空中和地面
temp
Merge branch 'pr/16'

Conflicts:

ShanghaiNaturalHistoryMuseum/OrderViewController/OrderDetailViewControll
er/OrderDetailViewController.m
temp
temp
Merge pull request #17 from MichaelYNWA/master

修复bug
Merge pull request #18 from MichaelYNWA/master

修复线路bug
MapViewController
1、不显示InfoItemClassroom 的信息点
Merge pull request #8 from goodnighthsu/master

获取最新项目 2014-10-17