Merge pull request #1 from Vossryn/master

Adding column sorting and filter
reintroducing roles