Merge branch 'jj' of github.com:eldilibra/guildCollective
running data through templates
[conflict] fixin the if any pieces conflict