Baystation12/Baystation12 — pull request #4017 by Ccomp5950 (2013-12-02 16:48:00+00:00)
Title: Changelog fix, putting Yinadale's stuff up top.

Hopefully done in a manner in which there shouldn't be any conflicts.