Merge pull request #4 from ucbklu/openucb-214

OPENUCB-214: Security update for entityreference-7.x-1.1 (develop branch)
Update build-openberkeley.make and drupal-org-core.make with comments regarding core updates
(Merge branch 'master' of https://github.com/ucb-ist-drupal/openberkeley-drops-7 into develop)
test1
Merge pull request #6 from bwood/panth

test1
Merge pull request #7 from ucb-ist-drupal/develop

test1 merge to master from develop