Shortening simpletests to perform to "System" group only [ADS-52]
Merge branch 'master' of https://github.com/mycognitive/ads

Conflicts:
	.travis.yml