update of the protocol
Merge branch 'master' of github.com:Ezveus/Mine
fixes & File request
Merge branch 'master' of github.com:Ezveus/Mine

Conflicts:
	server/WSHandler.rb