Stash commit-
Merge branch 'master' of github.com:dohnto/CDP

Conflicts:
	source/DigitalLighterServer/src/com/example/digitallighterserver/ImageMapper.java
Merge branch 'master' of github.com:dohnto/CDP