intermediate Content block widget refactoring
Merge from master branch
Content block testing and refactoring
Merge branch 'ContentBlockTesting' of https://github.com:boyko-karadzhov/Sitefinity/feather-widgets
small fixes on pull request