Switch texture and sound references to attributes.
Merge remote-tracking branch 'upstream/master'
Merge pull request #24 from dclaganiere/master

Switch texture and sound references to attributes.