camera icon
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

 merging camera icon