admin panel
Merge remote-tracking branch 'origin/master'
user picture repair
Merge remote-tracking branch 'origin/master'
bug fixes