Made introduction text div not beeing rendered if no intro text set
Merge branch 'master' into api-1.1
Merge branch 'api-1.1' into api-1.2