Merge branch 'hotfix/201416-hotfix-change-blacks-on-header' into develop
Merge branch 'develop'