20130527_1134
Merge branch 'master' of github.com:wemee/test