added cookie settings from cookiefixer branch
Merge branch 'master' into db_fix_w_input