Adapting to new asset structure.
Adapting to new asset structure.
Merge branch 'master' of https://github.com/Terasology/Fluid