Updated features/intertwine_layout_2012 and features/intertwine_new_site_menus