Fixed conflict in mads_temporals.
Merge branch 'develop' of https://github.com/ucsdlib/damspas into develop