email layout
email-template2
asasa
Merge branch 'master' of https://github.com/Motivable/motivable

Conflicts:
	protected/widgets/views/email-template.php