changes for 0.5
Merge branch 'master' of https://github.com/woutervanwijk/Pi-MusicBox

Conflicts:
	filechanges/etc/samba/smb.conf