San Diego Comic Con Extends Contract, Remains In San Diego Through 2021