Merge
added in qr codes
Merge remote-tracking branch 'abhi/master'

Conflicts:
	AndroidManifest.xml
Merge
Merge remote-tracking branch 'brad/master'

Conflicts:
	AndroidManifest.xml
merge
refactor
Merge remote-tracking branch 'upstream/master'