newsletter
Merge branch 'origin/develop'

Conflicts:
	css/layout.css
	protected/views/layouts/mail/system.php

mail newsletter