Solved conflicts
Added javadoc to SoundModule.