add json
Merge branch 'dev'

Conflicts:
	test/main.js
bump version