[UPDATE] minor bugfix to xhr and refactoring of base
Merge branch 'development'
Merge branch 'master' into development