implement SetPasswordViewController
Merge remote-tracking branch 'origin/master'
added vc to the right place