Merge branch 'development' of https://github.com/QuickBlox/SDK-android into development

Conflicts:
	AndroidManifest.xml