added holidy_block_list_allow
Merge branch 'master' into edge