OPENUCB-365: Remove references to FAQ module from profile
merge changes from upstream develop
Merge branch 'develop' of github:cboyden/openberkeley-drops-7 into develop
Merge branch 'develop' of github:ucb-ist-drupal/openberkeley-drops-7 into develop
Merge branch 'develop' of github:ucb-ist-drupal/openberkeley-drops-7 into develop
Merge branch 'develop' of github:ucb-ist-drupal/openberkeley-drops-7 into develop
OPENUCB-362: Add openberkeley_media to distro; entity_view_mode not required
OPENUCB-362: Remove entity view mode; comments in makefile and info file
Merge branch '362' of https://github.com/cboyden/openberkeley-drops-7 into cboyden-362
Add results of building the makefile with the changes to openberkeley_media and entity_view_mode
Merge pull request #79 from bwood/cboyden-362

OPENUCB-362 (revision): Add openberkeley_media to makefile and info file. Remove references to entity view mode.