rearrange protected infowindows columns
Merge branch 'develop'