Fix 2830 Browse PQs as nearby search
backport of NPE fix to release branch
Merge remote-tracking branch 'origin/release'
#3367: limit twitter message again during status post
Update changelog_release.xml
Try to fix failing test 

GC211WG was archived.
Replaced by new GC-code in same geographical area
Try to fix failing test (master)

As I do not have the ability to merge release to master, I did this manually. 
I hope, that this does not confuse the merging.
Version info
Update changelog_master.xml
fix #3376: Crash on start
Merge remote-tracking branch 'origin/release'

Conflicts:
	tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
fix #3299 - Find count not working for "1 cache"
Merge pull request #3379 from darekkay/release

fix #3299 - Find count not working for "1 cache"
Merge remote-tracking branch 'origin/release'
#3329 - Personal note on GC.com is only for premium members
Merge remote-tracking branch 'origin/release'
- Added new comparator to handle popularity ratios
- Added required resource strings
- Added teh new comparator to the user interface
  option
add test for okapi loading
Merge pull request #3385 from KiwiStone/sort_on_popularity_ratio

Added a new comparator to sort cache lists on popularity ratio
#3322: Option to 'show as list' only active when viewing live caches