tws
Merge branch 'master' of https://github.com/GufCab/Semester-Projekt---PC-Program

Conflicts:
	HiPi_PC/MetadataReader/FileIndexer/FolderAndFileReader.cs
Merge branch 'master' of https://github.com/GufCab/Semester-Projekt---PC-Program
Merge branch 'master' of https://github.com/GufCab/Semester-Projekt---PC-Program
Merge branch 'master' of https://github.com/GufCab/Semester-Projekt---PC-Program