Merge branch 'master' of https://github.com/asciamanna/ListeningTo

Conflicts:
	ListeningTo/Controllers/TopArtistsController.cs
Merge branch 'master' of https://github.com/asciamanna/ListeningTo