Halloween bump
small changes
s
Merge branch 'database_robert' of https://github.com/TheDizzler/space-union into database_robert
Merge branch 'database_robert' of https://github.com/TheDizzler/space-union into database_robert

Conflicts:
	Database/AdminControlForm/AdminControlForm/AdminForm.Designer.cs
	Database/AdminControlForm/AdminControlForm/AdminForm.resx
Merge branch 'database_michaelG' of https://github.com/TheDizzler/space-union into database_michaelG
Merge branch 'database_michaelG' of https://github.com/TheDizzler/space-union into database_robert
fxing