Merge pull request #400 from liuchuangww/user

Fix for privacy
Hide not used avatar sources
Merge branch 'user' of https://github.com/pi-engine/pi into user
Code cleaning up
Refactored privacy