Add gvfs and gvfs-mtp to mainpackages
Merge remote-tracking branch 'origin/master'
Small changes to mainpackages