made json fix
Merge remote-tracking branch 'origin/json_backend_fix'

Conflicts:
	models.py