Mars game staging

@BrettASwift Can you merge up to development if it's safe (and let Mark know when you do)?