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