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

Conflicts:
	jWebSocket/bin/.gitignore