Transferred to JST to enable javascript tag creation
Merged GS changes and enabled JST templates