Added ng_templates helper
Merge branch 'develop' into angular-templates-helper
Merge branch 'develop' into angular-templates-helper