GridHelController, grihelp.jsp
Merge branch 'entityChange' of https://github.com/PuRoTeam/PuRoGQM into entityChange

Conflicts:
	src/main/java/it/uniroma2/gqm/webapp/controller/GridController.java

Risoluzione conflitti Gridcontroller