Added controller-rendering view helper. Fixed bug in overriding class-level template.
Merge remote-tracking branch 'origin/master'