Added function setCookie, removed double entry in page source to presets.js (parent template already provides this)
Resolved merge conflict
resolved conflicts
Skipped a conflict indicator
Merge pull request #812 from maykinmedia/bb-1634

Bb 1634