Merge & Updates

Add animation to conversation
Change password
Reset pass email & actions