Merge branch 'master' of https://github.com/vikinghug/VikingClassResources into test-180
Merge branch 'development' of github.com:vikinghug/VikingClassResources into test-180
Merge pull request #36 from midraal/feature/outline_font

add outline font option
Merge pull request #38 from vikinghug/development

Development
Merge remote-tracking branch 'upstream/test-180'