merge 11 18
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/cam/dualcam/DualCamActivity.java