- Changed user avatar uploading.
Merge remote-tracking branch 'origin/jpa' into jpa