change text_block to markdown
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/content_blocks/text_block.scss
gemfile lock