Merge
Merge branch 'master' of https://github.com/tinkie101/SmartDoor

Conflicts:
	Source/res/values/strings.xml