Fixes for url builder tests
Merge branch 'develop' of github.com:socialize/socialize-sdk-android into develop