onResume
Merge branch 'master' of https://github.com/Ontree/Smart_Dental