Facebook working
Merged in desktop
Control forms
Update branch merged with Jose
Add User activated column
to merge with jose account
Menus and submenus
Meged with Jose
Merge origin/master
Merge origin/master
Fix errors
Commit to merge with wbb