fix #2250: "Scan QR code" doesn't work anymore
Update ChangeLog for #2250 fixing
Merge branch 'release' into upstream

Conflicts:
	main/res/values/strings.xml
	main/src/cgeo/geocaching/connector/IConnector.java
	main/src/cgeo/geocaching/connector/gc/GCConnector.java