Merge branch 'master' of http://github.com/h2r/robocook

Conflicts:
	server/lib/jWebSocketServer-1.0.jar
	server/lib/jWebSocketServerAPI-1.0.jar