hz
Merge branch 'master' of https://github.com/alexeiti/eventoris

Conflicts:
	eventorisMvc/target/m2e-wtp/web-resources/META-INF/maven/com.project/eventorisMvc/pom.properties