merging changes from upstream
merging changes from upstream
style changes to the first screen
incorporating the license carousel
added in qr codes
Merge remote-tracking branch 'abhi/master'

Conflicts:
	AndroidManifest.xml