Merge branch 'master' into map

# Conflicts:
#	TODO.md

README.md

@@ -2,7 +2,7 @@
 
 This is a tool for using Android with open-source mesh radios.  For more information see our webpage: [meshtastic.org](https://www.meshtastic.org).  If you are looking for the the device side code, see [here](https://github.com/meshtastic/Meshtastic-esp32).
 
-This project is currently early-alpha, if you have questions or feedback please join our chat [![Join the chat at https://gitter.im/Meshtastic/community](https://badges.gitter.im/Meshtastic/community.svg)](https://gitter.im/Meshtastic/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge).  We would love to hear from you.
+This project is currently early-alpha, if you have questions or feedback please [Join our discussion forum](https://meshtastic.discourse.group/).  We would love to hear from you.
 
 Once out of alpha the companion Android application will be released here:
 

TODO.md

@@ -164,6 +164,7 @@ Don't leave device discoverable.  Don't let unpaired users do things with device
 * Have play store entry ask users to report if their android version is too old to allow install
 * use git submodule for androidlib
 * update play store listing for public beta
+* track radio brands/regions as a user property (include no-radio as an option)
 
 Rare bug reproduced:
 
@@ -213,5 +214,4 @@ Transition powerFSM transition=Screen-on timeout, from=ON to=DARK
 NOTE: no debug messages on device, though we see in radio interface service we are repeatedly reading FromRadio and getting
 the same seven bytes.  It sure seems like the old service is still sort of alive...
 
-* track radio brands/regions as a user property (include no-radio as an option)