magfest/ubersystem — pull request #881 by binary1230 (2014-12-21 21:53:29+00:00)
Title: merge stuff into WIP branch

updating WIP with changes from Master, ignore this.