Escape javascript before submit
css markup
Merge branch 'pr-13'