fix some bugs and create flash alert upgrade account CR:PSG
Merge branch 'devede' into dev