Control forms
Update branch merged with Jose
Add User activated column
Menus and submenus
Merge origin/master
Merge origin/master
Fix errors
Commit to merge with wbb