Refactored Persistence to use FilterGroups
Merge branch 'master' of github.com:nicolaikruger/Oz_fra_BNDN-BSUP