add user match filters
Merge branch 'dev' of github.com:JamieWoodbury/Dragonfly-Client into dev