Parse JSON to HTML
Merge branch 'test' into dev