Add OwnerEmail column to nodes table
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	database.go

This is a combination bug-fix and re-adding of the email feature from
previously in the history.