Fix
infowindow layers
 Merge branch 'dev' into staging