WebSocketServer model added and integrated with app.js

Conflicts:
	server/app.js