add default content generator for all others
Merge branch 'master' into saiku3