HypatiaStation/HypatiaStation — pull request #203 by nullquery (2014-11-06 19:14:00+00:00)
Title: Merge with nullquery branch

Various fixes.