added tokens as features; looks at headers, especially subject line
Implemented 'UI'. not tested
done with UI
Merge branch 'master' into puremaster