Arjun: Added json exports
Merge branch 'dev-maps'

Conflicts:
	bin/testshell.py