Baystation12/Baystation12 — pull request #4146 by DJSnapshot (2013-12-30 11:13:12+00:00)
Title: Dev-freeze --> Master staging [DO NOT MERGE]

Approaching point we will be ready to merge. Last few bug fixes left to do.