Merge pull request #38 from ArcBees/ab_headerRefactor

Ab header refactor
Merge remote-tracking branch 'origin/master' into ab_footerRefactor
CR fix
Merge remote-tracking branch 'origin/ab_footerRefactor' into ab_footerRefactor