20140804 tv.news.english: Kim Kardashian-Paris Hilton kiss and make up post 6 year feud