Merge pull request #47 from ellemot/development

updating master
tweaks for fb pixel
Merge pull request #48 from ellemot/hotfix-091214

Hotfix 091214