Fix some bugs in test and following article CR:PSG
Merge branch 'master' of github.com:VAIRIX/plnproject
Merge branch 'master' of github.com:VAIRIX/plnproject
fix logout bug CR: PSG