jeffcao/lua_study — pull request #4 by jeffcao (2014-10-23 12:32:56+00:00)
Title: merge from Edward

merge "update tps", "添加大厅的素材 reses/dating"