boxes forgot pasword
mergning faizal scroll and senthils forgot password
Merge remote-tracking branch 'origin/master'