Merge pull request #1 from goodnighthsu/master

获取最新12/23
修改所有预约、线路的bug
修改学习单画图与scrollview冲突
Merge branch 'pr/40'

Conflicts:
	ShanghaiNaturalHistoryMuseum.xcodeproj/project.pbxproj
	ShanghaiNaturalHistoryMuseum/DataManager.m
	ShanghaiNaturalHistoryMuseum/GameCheckViewController.m
	ShanghaiNaturalHistoryMuseum/OrderViewController/OrderViewController.m