Implementation sprint1
Merge branch 'master' into HEAD

Conflicts:
	source/DigitalLighterServer/.classpath