User edit page. Table updates

User_has_marketingpreference
is now:
User_marketingpreference
merge