merge with svn r141
fixed unauthorized roles had show menus