Fixing for filter retention
Merge branch 'master' of https://github.com/Mrbilec/CMPUT301W14T09-GPSForm
Merge unresolved.  Left for John.