changes to database and Unit test
Merge branch 'master' of https://github.com/samsath/G64SWE_SpaceTrade

Conflicts:
	WindowsGame2/WindowsGame2/WindowsGame2/bin/x86/Debug/WindowsGame2.exe
	WindowsGame2/WindowsGame2/WindowsGame2/bin/x86/Debug/WindowsGame2.pdb
	WindowsGame2/WindowsGame2/WindowsGame2/obj/x86/Debug/WindowsGame2.exe
	WindowsGame2/WindowsGame2/WindowsGame2/obj/x86/Debug/WindowsGame2.pdb