[*] MO - eBay : merged last pull request + modified template manager