Merge branch 'master' of https://github.com/langtech/snapapps

Conflicts:
	edgy/changesToObjects.js