Resolve conflicts resulting from subtree pull of ob_base upstream
OPENUCB-362: Switched to jQuery 1.7 to fix issue with changing image mode in WYSIWYG.
Merge pull request #12 from dsnopek/openucb-362

OPENUCB-362: Switched to jQuery 1.7 to fix issue with changing image mode in WYSIWYG.
Merge upstream
Add jQuery Update as a dependency
Correction to .gitignore
Merge pull request #13 from bwood/openucb-418-jqueryupdate2

Openucb 418 jqueryupdate2
OPENUCB-425: Add subpane view mode for nodes inserted as content items
set default view mode to subpane for content items inserted as panes
Merge pull request #14 from cboyden-ucb/425

OPENUCB-425: Add subpane view mode for nodes inserted as content items
OPENUCB-453: Explicitly set all non-anonymous permissions to specific roles
Merge pull request #15 from cboyden-ucb/453

OPENUCB-453: Explicitly set all non-anonymous permissions to specific ro...
OPENUCB-425: Filter landing pages from the Content Item instert options, take 1
OPENUCB-425: Move the form alter to 'Content item' widget to openberkeley_pages.
Merge pull request #17 from dsnopek/openucb-425

OPENUCB-425: Don't show node link for landing pages in 'Content item' widget.