update event handling and detect face while taking photo
Merge branch 'master' of github.com:wkentaro/jishu-pro

Conflicts:
	scripts/detect_face.py