Merge pull request #1 from mcjimenez/master

Tested everything on desktop, and without the server side
Fixed some things with the server comm
And fixed manifest
And fixed some last thingies