first commit
fixed untracked file
simple menus
add related entities
merging