ctiao/DanmakuFlameMaster — pull request #30 by dreamer09 (2014-04-15 10:19:29+00:00)
Title: merge the master from ctiao

merge the new commits