rewrite to use FaviconMaker 1.0 new DSL and fix some issues in the process
Merge branch 'refs/heads/develop'