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

Conflicts:
	eventorisMvc/src/main/webapp/WEB-INF/eventorisMvc-servlet.xml
Merge branch 'master' of https://github.com/alexeiti/eventoris

Conflicts:
	eventorisMvc/src/main/webapp/WEB-INF/eventorisMvc-servlet.xml
your xml
merge
Commit file removal