Implemented deletion of overlay views
Merge remote-tracking branch 'origin/master'
Done deleting overlays
Merge remote-tracking branch 'origin/master'
merge master