Add roles and user combo to the permissions form
Merge origin/dev-master into dev-master
First grid filter test.