Update conference price calculator JS
Update conference extension
Fix production vs. master merge conflict