Merge branch 'master' into marty
Added reset of onclickups for plumbing vents to logout
Merge branch 'marty'