fixmergeuserissue
Merge pull request #486 from RageSmirk/patch-1

Handle isn't closed properly in backupdb.php
Merge pull request #739 from martec/fixmergeuserissue

Fix: #736 Merging two users removes both from the board stats
Feature #686 Disable Default MyCodes
Feature #686 Disable Default MyCodes
Remove buttons from editor if MyCode is disabled