BIER version
Added BIER's MAF to QueryBuilder
Added EVS & BIER MAFs
Resolved conflicts
Added populational mafs
Merge branch 'feature/bier' into feature/bierapp