diff --git a/admin/config/application.rb b/admin/config/application.rb
index 573e946f0..08b11d58c 100644
--- a/admin/config/application.rb
+++ b/admin/config/application.rb
@@ -126,6 +126,8 @@ module JamAdmin
config.twitter_app_secret = ENV['TWITTER_APP_SECRET'] || 'Azcy3QqfzYzn2fsojFPYXcn72yfwa0vG6wWDrZ3KT8'
config.ffmpeg_path = ENV['FFMPEG_PATH'] || (File.exist?('/usr/local/bin/ffmpeg') ? '/usr/local/bin/ffmpeg' : '/usr/bin/ffmpeg')
+ config.normalize_ogg_path = ENV['NORMALIZE_OGG_PATH'] || (File.exist?('/usr/local/bin/normalize-ogg') ? '/usr/local/bin/normalize-ogg' : '/usr/bin/normalize-ogg')
+ config.normalize_mp3_path = ENV['NORMALIZE_MP3_PATH'] || (File.exist?('/usr/local/bin/normalize-mp3') ? '/usr/local/bin/normalize-mp3' : '/usr/bin/normalize-mp3')
config.max_audio_downloads = 100
diff --git a/pb/src/client_container.proto b/pb/src/client_container.proto
index b9a7aeba0..5515757d9 100644
--- a/pb/src/client_container.proto
+++ b/pb/src/client_container.proto
@@ -481,6 +481,7 @@ message RecordingMasterMixComplete {
optional string msg = 3;
optional string notification_id = 4;
optional string created_at = 5;
+ optional string claimed_recording_id = 6;
}
message DownloadAvailable {
diff --git a/ruby/lib/jam_ruby.rb b/ruby/lib/jam_ruby.rb
index 98b93a4c1..649dc40e6 100755
--- a/ruby/lib/jam_ruby.rb
+++ b/ruby/lib/jam_ruby.rb
@@ -27,6 +27,7 @@ require "jam_ruby/constants/validation_messages"
require "jam_ruby/errors/permission_error"
require "jam_ruby/errors/state_error"
require "jam_ruby/errors/jam_argument_error"
+require "jam_ruby/errors/conflict_error"
require "jam_ruby/lib/app_config"
require "jam_ruby/lib/s3_manager_mixin"
require "jam_ruby/lib/module_overrides"
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/corp_mailer/feedback.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/corp_mailer/feedback.html.erb
index 611a9891b..7daab2af6 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/corp_mailer/feedback.html.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/corp_mailer/feedback.html.erb
@@ -8,7 +8,7 @@
-This email was received because someone left feedback at http://www.jamkazam.com/corp/contact
+This email was received because someone left feedback at http://www.jamkazam.com/corp/contact