fix #1658: show today literally
refactoring: TODO for moving unit conversion code
Add missing French translation
fix #1694: crash on import from mail
Merge branch 'release' into upstream

Conflicts:
	main/src/cgeo/geocaching/cgeocaches.java
version String
updated localization-it
Update base version code in manifest

This will help us identify better base version for developer builds in
logs.
Merge branch 'release' into upstream
Update milestone information and remove fixed issue
An id of 0 is not invalid when storing into the database

Also, simplify the code, and do not protect against exceptions that
cannot happen.

Found while discussing about #1701, but this is not the cause of the
problem.
Fix #1702: do not allow refreshing the "all caches" list

Not only refreshing the "all caches" list may cause performance problems
if the list is large, but also it moves the cache to a real
(non-virtual) list with the same id as the "all caches" list.
Fix #1702: do not allow refreshing the "all caches" list

Not only refreshing the "all caches" list may cause performance problems
if the list is large, but also it moves the cache to a real
(non-virtual) list with the same id as the "all caches" list.
Fix #1699: give resources to the "unknown" attribute
Add French translation for issue #1699 fix
Update bugfixes description
Merge branch 'release' into upstream

Conflicts:
	main/res/values/strings.xml
Small refactoring to clear possible race conditions. Load and Dowload
could overwrite each others searchResult
Fix #1668 Swapped methods cached/stored caches
Fix #1689, Saved cache replaced by parsed cache