Fixed ArtifactDependencyInfo and sub-type
Merge remote-tracking branch 'origin/master'

Conflicts:
	database.py
Fixed ArtifactDependencyInfo and sub-type