Upload image
Merge branch 'origin/master'
Admin - add function upload image
Merge branch 'origin/master'