Updated og_menu and og to version 3.0-rc5 and 2.6