minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	AddUser.aspx.cs
	FindUser.aspx.cs