Merge branch 'hotfix/20141114-blocks'
added blacklist
Merge branch 'hotfix/20141119-blocks1' into develop