Added block tags author and description
Merge branch 'develop'