newsletter
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/views/users/show.blade.php