Conflicts: CHANGELOG.md Gruntfile.coffee json/archives.json package.json src/Filtering/Anonymize.coffee src/General/Config.coffee src/General/lib/post.class src/Linkification/Linkify.coffee src/Monitoring/ThreadUpdater.coffee src/Posting/QuickReply.coffee