Finished the login pages.
Merge branch 'refs/heads/Annbranch'
retrieve password
retrieve password fix
Merge remote-tracking branch 'refs/remotes/origin/master'
add security code
Merge branch 'master'