Merge last version
Merge branch 'master' of https://github.com/hmjavier/dashboardv2.git

Conflicts:
	dashboardV2/WebContent/js/cnocConnector.js
	dashboardV2/WebContent/js/drawElementsGral.js
	dashboardV2/WebContent/js/drawElementsIncidents.js
	dashboardV2/WebContent/js/drawElementsPerformance.js
	dashboardV2/WebContent/js/drawElementsPerformanceGraph.js
	dashboardV2/WebContent/js/drawElementsPerformancev1.js
	dashboardV2/WebContent/js/jsEscalaciones/function_CNOC_NOTI.js
Merge
Merge branch 'master' of https://github.com/hmjavier/dashboardv2.git