update block and volunteers module
added taxonomy handling
Merge branch 'master' into develop
merge branch develop