More changelogging
Try to fix conflict on changelog
Merge branch 'master' of github.com:tomahawk-player/tomahawk
Merge branch 'master' of github.com:tomahawk-player/tomahawk
Merge branch 'master' of github.com:tomahawk-player/tomahawk
Fix arist icon so star is smaller and better centered in cirlce
Merge branch 'master' of github.com:tomahawk-player/tomahawk