configuring action mailer in hydrant.yml
Merge branch 'master' of github.com:variations-on-video/hydrant

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Gemfile.lock to force hydrant-engage to update to the latest version
Commit #1000
unpublished media objects should not be visible to users who aren't content creators.
Merge pull request #28 from atomical/media_objects_should_only_be_shown_if_they_are_published

unpublished media objects should not be visible to users who aren't cont...
Fixed Matterhorn in-place processing, detailed log for development
UI changes to item, browse/search results and manage groups views
Edits to branding stylesheets and multiple views (edit, preview, sidenav)
Removed trailing whitespace
Format streaming URLs via configurable handlers to allow greater flexibility