Merged menu pages; moved trails test version selection up a level;UI changes to main menu
Merge branch 'master' of https://github.com/ndm4766/smartstroke.git