2014/8/31 backup
last commit from server
fix conflict
去掉长租入口
del public assets
Merge branch 'master' of https://github.com/ofoso/ofo into develop
Merge branch 'development' of https://github.com/ofoso/ofo into development
Merge branch 'development' of https://github.com/ofoso/ofo into development
new table place