Merge branch 'master' of github.com:arshadkhan53/adtech into add-functional-js-test