d
d
Merge branch 'master' of https://github.com/dat0106/datkts0106

Conflicts:
	.idea/misc.xml
	SmartSchedule/.idea/workspace.xml
	child/Cameraservice/.idea/workspace.xml
	krvarma-android-samples/CameraEffectsDemo/.idea/workspace.xml
dta