add new options to T2 subject field
Merge branch 'master' into dev
new tooltips in T2