Merge remote-tracking branch 'origin/poonam-edits'
#60 4.0.1 Pc & Mobile

Fixed no officer selection bug, added basic mobile functionality, tested
Merge remote-tracking branch 'origin/master' into poonam-edits