new branch
fixed project version
updated maven plugin version
fixed a bug while setting the URI in the KBEntity
useless
updated to new schema
Revert "useless"

This reverts commit c724f69c04937f1d1ffa6722451c7566598c20d3.
Merge branch 's4cextension'

Conflicts:
	metamodels/commons/aggregate_functions_schema.xsd
	metamodels/commons/metrics_schema.xsd
	metamodels/examples/monitoring_actions.xml
	metamodels/examples/monitoring_grouping_categories.xml
	metamodels/examples/monitoring_metrics.xml
	metamodels/examples/monitoring_rules_SpecWeb.xml
	metamodels/examples/monitoring_rules_example.xml
	metamodels/examples/qos_metrics.xml
	metamodels/monitoringrules/actions_schema.xsd
	metamodels/monitoringrules/monitoring_rules_schema.xsd
	pom.xml
deleted
merge accomplished