Improved reliability of the dismissal of the Google Play services error dialog in the tests.
Refactoring: Lavatory types are now stored in a LavatoryType enum instead of a char.
fixed merge conflicts