Fixed bug with colSpan not being counted

colSpan now counted when building map structure and also storing row
info into cell data