Fixes on Map Widget and Carousel Image widget
Merge branch 'master' of https://github.com/glortho/csc