added colspan and rowspan html attributes
formatting
extended sorting test