IST-109, updated cell border
IST-109, added total row; fixed column headers
Merge branch 'master' into beta