Merge pull request #2 from danyilmaz/master

SHOP-1007: BAU: Add timeout to emarsys