v1.5.4.2

* Fix:  global: API call contained an invalid parameter (merged pull
request #62 from ljunkie)
* Fix:  current activity: music thumbs would not always display
Merge remote-tracking branch 'upstream/master'

Conflicts:
	settings.php