Menu construction
Merge branch 'greg'
Merge branch 'ns-interactions-init'
database -> 3.5.7
Merge branch 'master' into ns-interactions-init