test
Merge branch 'master' of https://github.com/ginere/ginere-site-generator

Conflicts:
	src/main/java/eu/ginere/site/nodes/ParseableTextNode.java