Baystation12/Baystation12 — pull request #5329 by comma (2014-06-22 18:23:15+00:00)
Title: mastere -> dev merge and a fix

Fixes a runtime in lgihting code
http://pastebin.com/WwM5qZZ1