fixed issues with measure not updating.  Removed old version of the measure, fixed redirect from the measure view, and passed type and episode of care information via hidden fields as part of update
merged with latest from develop