.
Merge branch 'master' of https://github.com/sfilargi/libcldk

Conflicts:
	src/cldk_client.c
Merge branch 'master' of https://github.com/sfilargi/libcldk
Merge branch 'master' of https://github.com/sfilargi/libcldk