.
Merge branch 'master' of https://github.com/sfilargi/cldk-android

Conflicts:
	.gitignore