Just about done with the server
Merge remote-tracking branch 'origin/master'

Conflicts:
	SessionSoft/Server/SessionSoftServer/Staff/Model.aspx.cs