added UTF-8 support, reformatted code
Merge remote-tracking branch 'upstream/master'

Conflicts:
	finediff.php