Packages
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/at/klu/qrcodequest/Activities/MainActivity.java
Merge remote-tracking branch 'origin/master'