fixing merge error
fixing merge error 2
applying the changes and fixes applied on 2014-10-10 to make 6 clients properly communicate with each other
Merge branch 'MikhailServer' of https://github.com/TheDizzler/space-union into AndrewServer
added comments for uncommented methods
Merge branch 'MikhailServer' of https://github.com/TheDizzler/space-union into AndrewServer
Merge branch 'MikhailServer' of https://github.com/TheDizzler/space-union into AndrewServer
Merge branch 'MikhailServer' of https://github.com/TheDizzler/space-union into AndrewServer
added start of ship table access, added work to admin form (space ship add/edit functionality
merging with mikhail's branch
Merge branch 'MikhailServer' of https://github.com/TheDizzler/space-union into AndrewServer
cleaned the solution
message types and some code added for lobby
Merge branch 'database_robert' of https://github.com/TheDizzler/space-union into MikhailServer
Creating data to transmit to the client.