First
Merge branch 'master' of https://github.com/fpoteau/PlxContentFtpBackup

Conflicts:
	config.php
PluXML 5.1.7