move user image into profile settings
Merge remote-tracking branch 'upstream/master'