Se implementa front-end y mensajes de edicion y preview de email
Merge branch 'master' of github.com:cbaspree/fsan_mailing

Conflicts:
	application/controllers/companies.php
	application/controllers/emails.php
	application/views/layouts/user_layout.php