final forms commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	sources/Administrator/UsersForm.Designer.cs
	sources/Administrator/UsersForm.cs