Merge branch 'erich_dev'

Adding the FIRO-B results page and the depression/counseling warning.