Add validation message in upload picture, Change avatar to picture
Fix conflicts after merging MH-965 to dev