Split club into content type feature and display feature.
Merge branch 'master' of github.com:gsbitse/gsb_public