- picture-selector
Merge origin/master
- fix logout bug