Squash merge of Vaidik's v1-train_payment branch includes all payment tests and updates to app objects