Added helper to retrieve componenets from within a template;
Fixed merge conflicts;