Merge branch 'hotfix/17-pipe-in-footer' into develop
Merge branch 'master' into develop
category rollover