Fixed ambiguity between template and controller.
Merge pull request #1477 from eneiand/patch-2

Fixed ambiguity between template and controller.