update
Merge branch 'master' of github.com:mooing/wss

Conflicts:
	.classpath