backup 20141023
Merge branch 'master' of github.com:jiereal/project