fix bug 934472 - Allow per-template main content area
Merge pull request #2302 from darkwing/main-content-934472

fix bug 934472 - Allow per-template main content area