revert state hide nav
Merge branch 'master' of github.com:dianping/cat
modify datetimepicker
modfiy all datetimepicker style
fix conflicts
modify datetimepikcer step = 30 m
Merge pull request #703 from leonindy/master

merge newest code which can solve test failures
Merge pull request #704 from jialinsun/master

much fix