Merge pull request #562 from fahadhatib/develop

Make columns sortable