Settings page updated
Settings page updated
Merge branch 'master' of https://github.com/GraemeEArthur/MapMyPlaylist

Conflicts:
	MapMyPlaylist/mapper