Merge branch 'master' into fix-grunt-css
Merge branch 'fix-grunt-css' of github.com:equimedialtd/funnel-front into fix-grunt-css