ISSUE_20 - Cleanup of server code
Merge branch 'ISSUE_20'

Conflicts:
	js/core/encoders/x3dom_encoder.js