Bug
1、CustomNavigationController 在动画过渡时禁用button
修改
1、StudyDetailViewController 去除不需要的
修改
1、展品零距离, 展品直接显示图片

Bug
1、CommentViewController 性能
临时修改
新增
1、我的消息
修改
更新
1、ShareSDK TencentWeiBo framework 支持 arm64
增加
1、App图标

修改
1、App名称
补 WeboApiObject.h
Merge branch 'pr/36'

Conflicts:
	ShanghaiNaturalHistoryMuseum/LookAndStudy/SpecialView/StoneAgeView.m
	ShanghaiNaturalHistoryMuseum/MapViewController.m

ShanghaiNaturalHistoryMuseum/VisitRouteViewController/VisitRouteViewCont
roller.m
优化GroupList
Merge branch 'pr/36'

Conflicts:
	ShanghaiNaturalHistoryMuseum/MapViewController.m
优化 路线icon显示
合并
代码格式整理
Merge branch 'pr/39'

Conflicts:

ShanghaiNaturalHistoryMuseum/VisitRouteViewController/ShakeAndDeleteView
.m
Merge pull request #1 from goodnighthsu/master

获取最新12/23