ALL MODELS:  Batch output overhaul for correct timestamp use; Timestamps added to all models
Merge branch 'jon' into sprint7
fix trex2 batch should be the last sprint6 update
Merge branch 'sprint6' into sprint7
Merge branch 'sprint7' of https://github.com/puruckertom/ubertool_src into sprint7