Update header.php
Merge branch 'master' into development