Merge branch 'master' of https://github.com/tuurma/Stylesheets into tuurma-master

Conflicts:
	Test/Makefile
	common/common_makeTEIStructure.xsl
Merge branch 'tuurma-master'