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

OPENUCB-245 and related tickets: Updating Panopoly 1.1 - merge to master (see comments)
OPENUCB-261: Update makefile for image_resize_filter security update to 7.x-1.14
OPENUCB-261: Fix typo - Update makefile for image_resize_filter security update to 7.x-1.14
OPENUCB-261: Commit image_resize_filter-7.x-1.14 security update built from makefile
Merge pull request #20 from ucbklu/openucb-261-imageresizefilter

OPENUCB-261: Security update for image_resize_filter-7.x-1.14