resolve conflict in css
#1635: Add Sidebar Teaser view mode
Resolve conflict sidebar teaser
Added sidebar_teaser display to sv_list #1636

Only applies to news, event, person.
Defined sidebar_teasers for news, event, person nodes.  #1636

They still need theming.
Removed extra buttons from slideshow edit.  #1557

Preview and diff weren't really necessary for the slideshow.  Getting either of them to display properly would be more effort than they're worth.  It'd be lovely to do that some day, but for now I'd rather not offer them.
resolve sidebar conflict
resolve sidebar conflict
resolve sidebar conflict
Fix people double title in sidebar.  #1636

The sidebar_teaser view mode for person nodes is all set.  Just needs styling.
add sidebar teaser, conflict
add sidebar teaser, conflict
Allow multiple vocabulary select list.
Adding comments.
Seperate the drupal_get_form and render function.
#1754: Images resized in wysiwyg will stay that size in node.
Revert "add click tracking and addthis integration to os_ga #746"

This reverts commit c5e8e8744edcf83e341325457ba404e02c232a39.
on 3.x add click tracking and addthis integration to os_ga #746
Subsites conflict
Resolve conflict in sec-nav-depth