Start of dynamic menu structure.
Merge branch 'master' of github.com:CTPUG/wafer