Merge pull request #70 from areveal/justin

Justin
created functionality on password reset
Merge branch 'master' into william
Merge pull request #71 from areveal/william

William
Updated all navbars
Merge branch 'master' into justin