bear's changes
these changes don't break the app
Merge branch 'bear-changes' into bear-safechanges
fixed bear's code so that the app runs
fixed bear's code so that the app runs
Merge branch 'bear-safechanges' of https://github.com/intelliot/FreezeRay3 into bear-safechanges

Conflicts:
	platforms/ios/www/js/app.js
	www/js/app.js
recieves QR code
exended QR scanner
giant merge