improved messeging and password reset.  added oneTimeSecret
Merge branch 'develop' into staging
changes for password reset as well as improved messeging system