Fixed the scanner registering on onPause and onResume
Merge branch 'master' of https://github.com/nlubczynski/DesignProject.git