fix line endings?
Merge branch 'master' of github.com:daveho/CloudCoder

Conflicts:
	CloudCoder/src/edu/ycp/cs/dh/acegwt/public/ace/worker-xquery.js