Merge branch 'master' into dev
Corrected the item.prop parameter to reflect its name
make.deltas
this is broken
fixed?
trying again
more attempts
testing
minor fix
label debug
fix labels
whoops bugfix
Merge branch 'dev'

Conflicts:
	R/wrightMap.default.R