dictionary/constants merge
basic generated model
dictionary label fixes
cleaned up navigation tree
cöient tests