fixed pixastic output
Merge branch 'pixastic'

Conflicts:
	js/face-detect.js