Avatar in user module
Merge pull request #395 from sexnothing/user

Avatar in user module
Added support for custom locator in comment
Merge branch 'user' of https://github.com/pi-engine/pi into user
Avatar ok
Merge pull request #396 from sexnothing/user

Avatar ok
Merge remote-tracking branch 'origin/user' into package