Merge pull request #1529 from dennishendriksen/master

Sort aggregate cols, fix nested modal backdrop issue
Filter ui enhancements
Bootstrap-switch
Pullrequests comments
Merge pull request #1530 from erwinwinder/master

Filter ui enhancements