changes A,B in issue01
changes C is issue01
Merge branch 'dev_1.0' of https://github.com/charmgranada/tc into issue01

Conflicts:
	sample.rtf
Merge branch 'issue01' into issue02