Change-Id: I75afba1c6275ace9a8241d71e6f045c6e4c88a80
Merge branch 'master' of https://github.com/horridus/ruins.git

Conflicts:
	jWebSocket/bin/.gitignore