JustCode
Merge branch 'master' of https://github.com/Kiinz/QrCodeQuestion

Conflicts:
	bin/AndroidManifest.xml