solve conflicts
Merge branch 'flotcharts' of https://github.com/capensis/canopsis-externals into flotcharts

Conflicts:
	webcore-libs/flot-plugins/custom/jquery.flot.canopsis.tooltip.js