m
kkk
Merge branch 'master' of https://github.com/AppZone-India/DLRS.git

Conflicts:
	Sim2Dial/lint.xml