Merge remote-tracking branch 'remotes/michael/master'

Conflicts:
	database/data.sql