[IMP] remove menu_id from user model
[MERGE] merge with latest trunk
[MERGE] merge with latest trunk
[IMP] merge with latest trunk
[MERGE] merge with latest trunk
[REM] removing menu_di
[MERGE][REM] Configurable menu action for users -- was broken (web part)