20140721 entertainment.hindi.bollywood: Karan Johar; Kajol have resolved their differences?