ContentBlock refactoring
Fixed merge issues
added ReferenceAssemblies
Merge branch 'master' of https://github.com:Boyko-Karadzhov/Sitefinity/feather-widgets into designerRefactoring