email & newsletter
Merge branch 'master' of github.com:khcr/eebulle

Conflicts:
	app/views/layouts/_admin_header.html.erb
	app/views/users/profile.html.erb
	config/routes.rb