marshall function should now be called toJSON to natively support JSON.stringify API
Merge branch 'master' of github.com:urturn/urturn-expression-api

Conflicts:
	dist/iframe.min.js