lol追加
Merge branch 'hotfix/20140425-lol'