added test block in contentmapper testcase
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into feature/block-content-type
added block content type to config
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into feature/block-content-type
Merge branch 'feature/block-content-type' of git://github.com/sulu-cmf/sulu into feature/template-reader-block-type