Conflicts:
	Classes/models/Asset.h