fix
fix
Fixes and addons
Instantor-specific project definition changes.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	code/project/Build.scala