Create button content type and field export definition
Merge branch 'develop' of github.com:johnshopkins/jhu.edu into develop
Merge branch 'develop' of github.com:johnshopkins/jhu.edu into develop
Updated machado