cleanup
Merge branch 'master' of https://github.com/kimoi/MangaIndex

Conflicts:
	import_xfers.php