Merge remote-tracking branch 'origin/play-count'

Conflicts:
	.gitignore
	MusicOrganizer.java