Merge branch 'master' of /home/denis/backendless/Android-SDK/Android-SDK with conflicts.
Merge remote-tracking branch 'origin/master'
BKNDLSS-7325 - fixed
Merge pull request #50 from Backendless/T-7325

T 7325