new changes from local
Merge branch 'dev' of https://github.com/Qasimmatech/dev-ritzcamera into dev