Merge branch 'dev'

Conflicts:
CHANGELOG.md
css/bootstrap.css
modules/FavouriteThreads.js
modules/NestedQuotes.js
modules/Quotes.js
preferences.js
settings_window.js
shurscript.user.js