user account activation completed
user account activation completed
conflicts removed
conflicts removed
changes in sessions controller
changes in user edit page