Update change log and bump version numbers

Author: simonpoole

CHANGELOG.txt

@@ -1,5 +1,10 @@
 See https://github.com/MarcusWolschon/osmeditor4android/ for documentation on this version and all changes.
 
+21.2.0.2:
+
+- Fix disambiguation menu regression when merging node to multiple ways
+- Fix inverted logic when creating the disambiguation menu in some cases
+
 21.2.0.1:
 
 - Fix wrap welcome text in a ScrollView

src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto"
-    android:versionCode="3300"
+    android:versionCode="3301"
     android:versionName="@string/app_version" >
 
     <uses-sdk tools:overrideLibrary="androidx.core.splashscreen" />

src/main/res/values/appname.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string translatable="false" name="app_name">Vespucci</string>
-    <string translatable="false" name="app_version">21.2.0.1</string>
-    <string translatable="false" name="app_name_version">Vespucci 21.2 BETA 1</string>
+    <string translatable="false" name="app_version">21.2.0.2</string>
+    <string translatable="false" name="app_name_version">Vespucci 21.2 BETA 2</string>
 </resources>