2014check
Merge branch 'master' of github.com:guoxiangke/love
fix
365
Merge branch '2014' of github.com:guoxiangke/love into 2014