Merge branch 'master' into development
[UPDATE] Added XHR, minor changes
Merge branch 'development'