Merge branch 'master' into development
[UPDATE] fixed major bug in xhr
Merge branch 'development'