Merge branch 'master' of github.com:ucb-ist-drupal/openberkeley-drops-7 into openucb-278
Update info and makefile for initial panopoly_apps and ob custom modules.
OPENUCB-310: Add openberkeley_wysiwyg_override
OPENUCB-310: Pulled in the latest panopoly_wysiwyg 1.x-dev and updated ucb_openberkeley and openberkeley_wysiwyg_override to take advantage of it.
Pull in latest changes from openberkeley_wysiwyg_override.
Merge pull request #42 from dsnopek/openucb-310

OPENUCB-310: Updated openberkeley_wysiwyg_override and related updates to makefile, profile, ucb_openberkeley, and panopoly_wysiwyg.
OPENUCB-317: Update makefile for openberkeley_core_override
OPENUCB-317: Commit openberkeley_core_override updates built from makefile
Merge pull request #45 from ucbklu/openucb-317

OPENUCB-317: Add openberkeley_core_override
Merge branch 'develop' of github:ucb-ist-drupal/openberkeley-drops-7 into openucb-320