[web] Added map items and collisions support
Merge branch 'master' of https://github.com/Nodeventures/Nodeventures

Conflicts:
	server/handlers/LoginHandler.js