dev 131106
Merge branch 'master' of github.com:guoxiangke/love