1
Merge branch 'master' of https://github.com/topsale/com-funtl-java-visitors

Conflicts:

	code/target/classes/META-INF/maven/com.funtl/funtl-visitors/pom.properties