Netbeans hint – use Tomcat.
Merge branch 'develop' of https://github.com/michal-ruzicka/MathMLCanEval into develop

Conflicts:
	mathmlcaneval-frontend/pom.xml