Is the feud over between Kim Kardashian and former assistant Stephanie Shepherd? It looked like it, as they were seen being close again during Kourtney Kardashian's 39th birthday bash.