Merge branch 'master-newdesign-15-Dec-location' of https://gitlab.com/haroon6138/mohemmionic5 into master-newdesign-15-Dec-location

# Conflicts:
#	Mohem/config.xml
mohemm-nfc-enad
choudhry masood 5 years ago
commit ad99cf9a37

Diff Content Not Available