backup 130312
XXMerge branch 'master' of github.com:guoxiangke/love