Merge branch 'master' of https://github.com/kshur/ccdevs into kshur-master

Conflicts:
	src/com/lge/ccdevs/tracker/CameraActivity.java
	src/com/lge/ccdevs/tracker/CameraPreview.java
Merge remote-tracking branch 'batteryShin/master'

Conflicts:
	src/com/lge/ccdevs/tracker/CameraActivity.java
	src/com/lge/ccdevs/tracker/CameraPreview.java