Conflicts: src/General/Header.coffee src/Images/ImageExpand.coffee src/Monitoring/ThreadUpdater.coffee