Merge remote-tracking branch 'origin/test'

Conflicts:
	faceForm/github.txt