Make the 'link' and 'link url' configurable via the web page
Update Changelog
Merge branch 'master' into release