clean up, added ScanActivity, reference to zxing library, use of IntentIntegrator and IntentResult, and general code clean up from renaming things