User image upload e directrizes newsletter
Merge branch 'master' of https://github.com/brightgit/bmm

Conflicts:
	inc/views/bo/mass_email.view.php