Merge pull request #20 from elderbas/master

updating server side stuff
client cube movement and IDs implemented
Merge pull request #21 from roryc89/master

client cube movement and IDs implemented
updated talk alert
fixed merge conf