Merge remote-tracking branch 'origin/develop' into case-2005
case 2005 - Added new class for lastfm-icon.
Merge remote-tracking branch 'origin/case-2005' into develop