Merge remote-tracking branch 'origin/master' into stm-flash

Conflicts:
	altosdroid/Notebook

diff --cc altosdroid/Notebook
index 6c5cfacfe51b3c4dcf5dc900d0b6753a8ef15c01,b2ae407c79953488c8cf0ac2522174633c17623a..22f0394b60574f7e344035180488a810541e8681
--- 1/altosdroid/Notebook
--- 2/altosdroid/Notebook
+++ b/altosdroid/Notebook
@@@ -21,5 -21,6 +21,8 @@@ Desired AltosDroid feature lis
  
   *) Select satellite imaging mode
  
 -    
 + *) Re-loading flight data from .telem file to get back to
 +    'find my rocket' mode after shutting down the application.
++
+  *) Remember most-recently-used TBT and frequency, perhaps
+     auto-connect at startup.