Merge branch 'master' of https://github.com/StoneRose35/MusicBucket.git

Conflicts:
	PTCAccess/Interop.PortableDeviceApiLib.dll