beyond-z/beyondz-platform — pull request #113 by adamdruppe (2014-07-11 21:02:52+00:00)
Title: briang's changes with merge conflicts fixed

This should work for both of our changesets.