fixed bug in the v1.0 for production
commit
Merge branch 'master' of https://github.com/gpub/pjeGitProject into r2_second