MagLev/maglev — pull request #261 by BloodyD (2013-02-07 14:03:56+00:00)
Title: Dikors/merge file 1.9

resolved conflicts, while merging matthias/file-1.9