Merge develop into Prod for 7.10.4 release, 8/22/14
Merge develop into Prod for 7.10.5 release, 8/29/14
Merge branch 'develop'
Merge branch 'develop'
re-insert "txt" (searchable) versions of publish fields
bug fix and feature for emailing from saved list and move catalog email tests to email feature