modified PoliceEncounterScreen.java
Merge origin/master