Merge branch 'qa' into development

* qa:
  finishing last bugs I think
  bug fixes
  fixed verifiy with no sessions bug
  fixed a few bugs
  messing with email again
  messing with email again
  changing reports to open new window
  changed smtp to amahls gmail
tweaking reports
Merge branch 'development' into qa

* development:
  tweaking reports