Merge pull request #9 from ucb-ist-drupal/master

Pulling OPENUCB-217 update from master to develop
Update openberkeley.info with version number
OPENUCB-225: Update makefile for media-7.x-2.0-alpha3+26-dev, file_entity-7.x-2.0-alpha3, media patch
OPENUCB-225: Commit updates built from makefile: media-7.x-2.0-alpha3+26-dev, file_entity-7.x-2.0-alpha3, media patch
Merge pull request #10 from ucbklu/openucb-225

OPENUCB-225: Fix Media module Wysiwyg integration
Merge pull request #11 from ucb-ist-drupal/develop

Pull from develop to master (OPENUCB-225: Fix Media module Wysiwyg integration)