cleanup
Merge branch 'development' of github.com:QuickBlox/quickblox-android-sdk into development
cleanup