update
Merge branch 'niagara' of https://github.com/antowan/jquery-widget-heatmap into niagara

Conflicts:
	libs/m2m/wawax.control.m2m.bajascript.js