Edited Headliner
Merge branch 'develop' into staging
Merge pull request #4 from Boeru/staging

Staging