add forgot password activity
merge code