Merge pull request #3622 from Erthilo/dev

Merging Dev-Freeze and Master into Dev
Moved maptools to tool/mapmerge. Added midi2piano and AddToChangelog.
Unticked files to deal with string limit.
Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work.
Species now have individual punch damages.
More attempts at string limit string reduction.