Merge Conflicts saved. Fixed error on tablet (database close exception)
Merge branch 'master' of https://github.com/tinkie101/SmartDoor