[UPDATE] added CORS support to xhr, minor bugfixes
Merge branch 'development'
Merge branch 'master' into development