Added support for more content types to be displayed as buttons.
Merge branch 'master' into more-buttons
Merge branch 'more-buttons'