Updated "jcafb_2015_surveys".
Merge branch '7.0' into 7.0-oehealth