Merge branch 'tempWork' into stable

Conflicts:
	Server/DatabaseController.cs
	Server/Service.cs