hhh
Merge branch 'master' of https://github.com/dohnto/CDP

Conflicts:
	source/DigitalLighterServer/src/com/example/lightdetector/CameraActivity.java
Merge branch 'master' of https://github.com/dohnto/CDP
time offset
Merge branch 'master' of https://github.com/dohnto/CDP