Minor changes to delta
Merge branch 'testing' into development

Conflicts:
	delta.sql