Added posibility to create menu elemets for role and for user
Marge conflicts
Merge conflicts