some consts added.
Merge branch 'master' into multilevelMenu