Fix undefined method '/' error when the master file is still accessible
Merge pull request #348 from avalonmediasystem/bugfix/VOV-2850

Fix undefined method '/' error when the master file is still accessible
Upgrade to active-fedora 6.7.8
Bump avalon-about version
Update to rubydora ~> 1.7.5
Redirect to lti group facet when in lti context even when the user belongs to other external groups
Merge pull request #350 from avalonmediasystem/bugfix/VOV-2871

Redirect to lti group facet when in lti context even when the user belon...
urls should be absolute for e-mails
Merge pull request #351 from atomical/bug/urls-in-batch-ingest-email-are-not-absolute

urls should be absolute for e-mails
update to rubyracer needed for mavericks
Merge branch 'develop' into task/update-ruby-racer

Conflicts:
	Gemfile
	Gemfile.lock
Merge pull request #352 from atomical/task/update-ruby-racer

update to rubyracer needed for mavericks
Peg delayed_job_active_record at 0.3.3 because of postgres issues
Expose Permalink URL helper
Merge pull request #353 from avalonmediasystem/permalink-url-method

Expose Permalink URL helper
Merge pull request #354 from avalonmediasystem/bugfix/postgres

Peg delayed_job_active_record at 0.3.3 because of postgres issues
Fix bug where audio icon shows for item with only unprocessed video
Merge pull request #355 from avalonmediasystem/bugfix/VOV-2873

Fix bug where audio icon shows for item with only unprocessed video
user autocomplete should return either username or email, depending on user_key
Adjust User.autocomplete test in object controller tests