marker layout
Merge branch 'master' of https://github.com/DieterVanmoortel/feature_map

Conflicts:
	css/feature_map.css
	feature_map.module
	includes/feature_map.helpers.inc
prettier infowindows