first menu tests, getting a handle on the whole menu structure now
Merge remote-tracking branch 'origin/master'