Merge afb-client
drwxr-xr-x - afb-client
drwxr-xr-x - afm-client