Baystation sync as of 27th November 2014
Merge github.com:HypatiaStation/HypatiaStation