remove id and change templates to template in email directory
remove id and change templates to template in email directory
blog send as news letter body or summary
blog send as news letter body or summary
blog send as news letter body or summary
blog send as news letter body or summary
Merge origin/master

Conflicts:
	config/doctrine/schema.yml
Merge origin/master

Conflicts:
	config/doctrine/schema.yml