Changelog fix, putting Yinadale's stuff up top.

Hopefully done in a manner in which there shouldn't be any conflicts.
Merge pull request #4017 from Ccomp5950/changelog

Changelog fix, putting Yinadale's stuff up top.
Fixes #2355
Bugfix:  AI's will no longer disintegrate if they click the supermatter.

While hilarious this is a terrible bug.
Bugfix:  AI no longer dies if touching the supermatter, using attack_ai instead of a isAI() check.
Merge pull request #4026 from Ccomp5950/ai_supermatter_badtouch

Bugfix:  AI's will no longer disintegrate if they click the supermatter.
Merge pull request #4025 from nightexcessive/bugfix/ai-apc

Fixes #2355
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into investigate_fix