Related to #282
Closes #1097

Old: `<tag content="Human Readable Text">internal-id</tag>`
New: `<tag key="internal-id">Human Readable Text</tag>`

Fixes #826
Fixes #1095

Fixes #2

svn path=/trunk/; revision=30098

svn path=/trunk/; revision=24869

svn path=/trunk/; revision=24793

svn path=/trunk/; revision=24775

svn path=/trunk/; revision=24774

svn path=/trunk/; revision=24769

svn path=/trunk/; revision=24768

svn path=/trunk/; revision=24767

svn path=/trunk/; revision=24766

svn path=/trunk/; revision=24765