Merge remote-tracking branch 'origin/master' into Jay
commented out expiration date and added editusers to enum
Merge branch 'Jay' of https://github.com/eric-citizen/AOS into Jay

Conflicts:
	CZAOS/CZAOSWeb/controls/UserGrid.ascx.cs
Fixed Merging Errors
Merge remote-tracking branch 'origin/Jay'