Change some of the content on Friday at 14:48
Merge branch 'master' of https://github.com/nsTsoTest2/testPublicRepo into nsTsoTest2-master

Conflicts:
	documents/00001.xml