EliAndrewC/magfest — pull request #228 by binary1230 (2014-05-26 18:06:37+00:00)
Title: merging all dev changes into Master

WIP pull request, this will be open for a while as I (Dom) fixup some features. This is associated with the currenly opened Milestone in Github.