serverupdates
Merge remote-tracking branch 'origin/master'

Conflicts:
	SMART INTEGRATION
MONITOR/interfaceWithmaven/target/classes/Analisis/ClientRule/ClientRule.class
	SMART INTEGRATION
MONITOR/interfaceWithmaven/target/classes/Analisis/Smart/AIInterface.class
	SMART INTEGRATION
MONITOR/interfaceWithmaven/target/classes/connection/Network.class
	SMART INTEGRATION
MONITOR/interfaceWithmaven/target/classes/entity/Rule_.class