first steps with organization styles
common submodule updated
conflict solved + user list implemented