Google adwords code changed by request from OM
Merge branch 'master' into hitesh/features/elasticsearch