Merge branch 'master-newdesign-15-Dec-location' of https://gitlab.com/haroon6138/mohemmionic5 into master-newdesign-15-Dec-location
# Conflicts: # Mohem/config.xmlmohemm-nfc-enad
commit
ad99cf9a37
# Conflicts: # Mohem/config.xmlmohemm-nfc-enad