[FIX] Weird git issue with files
Merge branch 'master'

Conflicts:
	xID/xid.php
	xID/xisbn.php