updated cookie model js
whatevs
fixed merge