Aurorastation/Aurora — pull request #100 by skull132 (2014-06-04 15:24:55+00:00)
Title: Pre-Merge 02

Preparing for the second merge.