server
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	.gitignore
	WebContent/js/SERVER.js
	build/classes/.gitignore