Merge branch 'master' into develop

Merge changes back to develop branch
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/master' into develop
updated changes
conditional ALSA pcm settings in musicbox startup.sh
Fixed tab/space inconsistency
Merge branch 'develop'