Add lookup for templates in window.HandlebarsTemplates
Merge branch 'master' into develop