Merge pull request #2 from dsnopek/openucb-316

OPENUCB-316: Fixed issue where the demo content wouldn't be removed when module was disabled.
Allow Page Manager paths to be imported
Merge pull request #3 from bwood/improve-menu_preparerow

Allow Page Manager paths to be imported
OPENUCB-316: Switch from panopoly_page to openberkeley_content_page.