Fix #2356. Compare languages not locales
Update change log for #2337
Version info
Fix #2356. Compare languages not locales

Cherry-picked from master.

Conflicts:
	main/src/cgeo/geocaching/CacheDetailActivity.java
Disable SimpleDirChooserUITest for now

It currently breaks the continuous integration server, making it much
less useful.
Fix merge error
Fix #2357. Close progress dialog when ending activity

This corrects errors of leaking the dialog.
Merge branch 'windowLeak' of https://github.com/campbeb/c-geo-opensource into upstream