Merge "EVS Manager, App, and Test initial submission"