fixed get_timestamps not including directories and integrated server_daemon with authentication
added authentication
fixed merge conflicts