changed makefile
fixed merge conflicts
renamed to fs_client-api