Prova
Merge branch 'master' of https://github.com/Caos81/autotest-console.git

Conflicts:
	autotest-console/pom.xml
	autotest-console/src/main/webapp/index.html