...
...
Infinity loop error in tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/eu/ginere/site/SiteGenerator.java
	src/test/java/eu/ginere/site/template/NodeFinderTest.java