update for adding iOS support
Merge branch 'master' of https://github.com/XebiaIncubator/XebiTest