[UPDATE] made qoopido/xhr more configurable
Merge branch 'development'
Merge branch 'master' into development