NR-462 : Upload User Image functionality missing (add user image to where it's applicable)

fix rebase
Merge branch 'devel' of dev.sourcefabric.org:superdesk into devel