Change database
Merge remote-tracking branch 'origin/master'

Conflicts:
	Model/Database.h