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
Hot fix JS error.
Case 2111 - Syntax fix.
Merge branch 'case-2162' into develop
Revert "Case 2111 - Syntax fix."

This reverts commit 184f2e635356ac5cabe9c7e6eeff10b7f8125761.
Merge branch 'develop' into case-2162