import
Merge branch 'develop' of https://github.com/Aelphy/badgenator_conf into develop