Fixed simulator
Merge branch 'dokterClient' of https://github.com/man1utdfan/RemoteHealthcare into dokterClient