Merge branch 'development' into qa

* development:
  fixed the session totalling bug.  chnaged the smtp to verizon
removed the port from the email creds
messing with email
messing with email
messing with email
messing with email
fixed stupid popup stuff
Merge branch 'qa' into development

* qa:
  fixed stupid popup stuff
  messing with email
  messing with email
  messing with email
  messing with email
  removed the port from the email creds