ISAACLOUD-303 Update
Merge branch 'dev' of https://github.com/isaacloud/android-sdk into dev