Signed-off-by: Leon <airsiao@gmail.com>
Merge branch 'master' of https://github.com/airsiao/OpenFace.git

Conflicts:
	res/data/debug.xml

Signed-off-by: Leon <airsiao@gmail.com>
Signed-off-by: Leon <airsiao@gmail.com>