small newsletter route fixes
merge conflicts
edit user form
merge conflicts
merge conflicts