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
changing reports to open new window
Merge branch 'development' into qa

* development:
  changing reports to open new window
changing reports to open new window