Added file upload on client
Fixed conflict on client index.html