Added sound support and 1 sound
Merge remote-tracking branch 'origin/develop' into develop