Adding contextpath to cookie
Merge remote-tracking branch 'origin/master'