Merge pull request #17 from ProjectSWGCore/master

pull
Colored junk naming convention
small template fix for RE attachments
Merge pull request #874 from zingzing175/master

Junk loot color naming and small template fix for Re ing.