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

Conflicts:
	source/DigitalLighter/bin/AndroidManifest.xml
	source/DigitalLighterServer/.classpath
	source/DigitalLighterServer/bin/dexedLibs/TestFlightLib-6e74314915fffd740708c536a7d5e64c.jar
	source/DigitalLighterServer/bin/dexedLibs/android-support-v4-fa7ead47a1a42bee6aef8004c99c899f.jar
	source/DigitalLighterServer/src/com/example/digitallighterserver/Connection.java