Merge pull request #1691 from nabinhait/v4-hotfix

build_filter_conditions and pricing rules
Remove blank lines from uploaded file of attendance #1714