Added libdvd* to mainpackages; ntfs-3g to isopkgs
Merge remote-tracking branch 'origin/master'

Conflicts:
	custom/mainpackages