pull changes from master to heatmap circles and notes