Fixy Fixy
Merge branch 'master' of https://github.com/iamwolf/biauthorise-server

Conflicts:
	public/facedetection/dialog.html