Baystation12/Baystation12 — pull request #5094 by DJSnapshot (2014-05-30 23:11:50+00:00)
Title: Dev freeze --> Master

Oh boy merge conflicts!