Merge pull request #6 from goodnighthsu/master

获取最先项目 2014-10-17
222
修改map倒计时，修改预约查询bug
Merge branch 'pr/16'

Conflicts:

ShanghaiNaturalHistoryMuseum/OrderViewController/OrderDetailViewControll
er/OrderDetailViewController.m