merge branches

MyTracks/res/menu/track_list.xml

@@ -74,6 +74,10 @@ limitations under the License.
     android:icon="@drawable/menu_settings"
     android:id="@+id/track_list_settings"
     android:title="@string/menu_settings"/>
+  <item 
+    android:icon="@drawable/menu_feedback"
+    android:id="@+id/track_list_feedback"
+    android:title="@string/menu_feedback"/>
   <item
     android:icon="@drawable/menu_help"
     android:id="@+id/track_list_help"

MyTracks/res/values/strings.xml

@@ -974,6 +974,12 @@ limitations under the License.
       Character limit: ~20 (1 line)">
     Edit
   </string>
+  <string name="menu_feedback"
+    translation_description="In the menu, to enter feedback.
+
+      Character limit: ~20 (1 line)">
+    Feedback
+  </string>
   <string name="menu_help"
     translation_description="In the menu, to go to the help page.