Photo uploading and create item
conflict resolve
Merge branch 'master' of https://github.com/AquaVision/Vmart