virtual-world-framework/mars-game — pull request #461 by BrettASwift (2014-10-02 17:51:20+00:00)
Title: Study Features to Staging

@kadst43 @eric79

I had to do a bit of merge conflict handling, so a healthy amount of testing would be a good thing.