lianqin7/overlay — pull request #1 by lianqin7 (2013-11-18 06:53:34+00:00)
Title: merge master

merge master