Some changes.
Merge branch 'master' of github.com:dohnto/CDP

Conflicts:
	source/DigitalLighterServer/src/com/example/lightdetector/CameraActivity.java
	source/DigitalLighterServer/src/com/example/lightdetector/PointCollector.java