Baystation12/Baystation12 — pull request #6261 by laser50 (2014-09-02 14:50:04+00:00)
Title: Merging Dev branch into Main

A few errors and conflicts were to be expected, all were resolved.