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

Conflicts:
	snippets/src/com/quickblox/snippets/modules/SnippetsCustomObjects.java