v1 renameHandler
v1 renameHandler -conflict resolve bis
v2 renameHandler
Merge remote-tracking branch 'origin/master'

Conflicts:
	utils/ActionManager.php
Merge remote-tracking branch 'origin/master'
modification commentaire prepareMoveReturn