Merge pull request #40 from rohaus/master

Fix merge bugs
Merge pull request #41 from rohaus/master

Fix incorrect property names
Change load time to 4 seconds
Refactor socket.js
Merge branch 'dev'