start initial device testing adjusted config.xml2
merge current state of master with adjustments to config.xml