All changes made in forming the rough-in of the Intensity_Data class
Merge remote branch 'origin/master'