Ensuring "travis_ads_test" database is created (it is required by build). [ADS-1]
Ensuring "travis_ads_test" database is created (it is required by build). [ADS-1]
Merge branch 'master' of http://github.com/mycognitive/ads

Conflicts:
	puppet/ads.dev.configure-site.pp
Ensuring "travis_ads_test" database is created (it is required by build). [ADS-1]