Fix restore method of HeatmapOverlay and MacroblockOverlay
Merge branch 'master' of https://github.com/V02460/CTT.git