Merge pull request #19 from ucb-ist-drupal/develop

OPENUCB-245 and related tickets: Updating Panopoly 1.1 - merge to master (see comments)