Merge branch 'dev'

Conflicts:
	xspf-plgen-admin.php