Merge remote-tracking branch 'origin/master'

Conflicts:
	src/at/klu/qrcodequest/HTTPHelper.java
	src/at/klu/qrcodequest/RegistrationActivity.java