Escape javascript before submit
Merge branch 'pr-12'
Replace X with cog
Merge branch 'pr-13'
templates