A little change to searchViewController
Merge remote-tracking branch 'origin/master'
Finished password view controller