Diagrammi a nastro
boh
merge boh

Conflicts:
	WIP/ModelingProject/DynamiCalModeling/DiagrammaCalendario.classdiagram

	WIP/ModelingProject/DynamiCalModeling/DiagrammaCalendario.classdiagram.layout
	WIP/ModelingProject/DynamiCalModeling/DiagrammaFiltri.classdiagram

	WIP/ModelingProject/DynamiCalModeling/DiagrammaFiltri.classdiagram.layout
	WIP/ModelingProject/DynamiCalModeling/DynamiCalModeling.modelproj
	WIP/ModelingProject/DynamiCalModeling/ModelDefinition/Package1_1645.uml
	WIP/ModelingProject/DynamiCalModeling/ModelDefinition/Package2_1645.uml
	WIP/ModelingProject/DynamiCalModeling/ModelDefinition/Package3_1645.uml
	WIP/ModelingProject/DynamiCalModeling/ReverseEngineering.Log.xml