Update DataManager.m
Merge branch 'pr/1'
git hub init
Merge branch 'pr/2'
Delete
新增

1、[DataManager serverAddress] 场馆内和场馆外使用不同的ip
2、DataManager  图片批量下载

修改
1、使用企业证书
2、 LookAndStudy 图片使用批量下载
Merge branch 'pr/3'

Conflicts:

ShanghaiNaturalHistoryMuseum.xcworkspace/xcshareddata/ShanghaiNaturalHis
toryMuseum.xccheckout

ShanghaiNaturalHistoryMuseum.xcworkspace/xcuserdata/michaellu.xcuserdata
d/UserInterfaceState.xcuserstate
	ShanghaiNaturalHistoryMuseum/DataManager.h
	ShanghaiNaturalHistoryMuseum/LookAndStudy/LookStudyViewController.m
	ShanghaiNaturalHistoryMuseum/ShanghaiNaturalHistoryMuseum-Prefix.pch
Merge pull request #3 from MichaelYNWA/master

修改bug
Merge pull request #1 from goodnighthsu/master

Merge 3