local config
Merge branch 'master-alpha' of https://github.com/blinkbox/testswarm into master-alpha

Conflicts:
	inc/libs/ua-parser
Fixing bug 1899: Testswarm: Undefined index: userAgents in C:\Blinkbox\testswarm-v2\inc\pages\ResultPage.php on line 67