Conflicts: css/style.css src/Images/ImageExpand.coffee src/Linkification/Linkify.coffee src/Monitoring/ThreadUpdater.coffee