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

Conflicts:
	source/DigitalLighter/bin/classes.dex
	source/DigitalLighter/src/com/example/digitallighter/MainActivity.java
	source/DigitalLighterServer/bin/resources.ap_