Fixed </ literals in JSON data
Merge branch 'dev'