Changes: Flattened menu structure
Merge branch 'master' into xmlbg
.