Began merge of the wavelet labs
Merge branch 'develop' into wavelets
Merge branch 'develop' into wavelets
Merge pull request #39 from byuimpactrevisions/wavelets

Wavelets