Product table settings store in cookie
Merge branch 'dev'