Merge origin/master

Conflicts:
	PhpProject1/lib/dao/RolsFtpDAO.php