Merge pull request #560 from rbs-maugier/master

Fix #484 and Fix #486
[Fix]Style : cross-selling & tag editor
[Fix]Document-list collection-url handling