Added server error check on upload and got rid of lock in model.
managing branches