add mail-activation
minor changes on mail-activation branch
Mail activation integration